summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/flac_decoder.c2
-rw-r--r--src/combined/flac_demuxer.c2
-rw-r--r--src/combined/nsf_decoder.c2
-rw-r--r--src/combined/nsf_demuxer.c2
-rw-r--r--src/combined/wavpack_combined.c2
-rw-r--r--src/combined/wavpack_combined.h2
-rw-r--r--src/combined/wavpack_decoder.c2
-rw-r--r--src/combined/wavpack_demuxer.c2
-rw-r--r--src/combined/xine_ogg_demuxer.c2
-rw-r--r--src/combined/xine_speex_decoder.c2
-rw-r--r--src/combined/xine_theora_decoder.c9
-rw-r--r--src/combined/xine_vorbis_decoder.c2
12 files changed, 15 insertions, 16 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index cc7c9570a..75465f6fe 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* John McCutchan 2003
* FLAC Decoder (http://flac.sf.net)
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index b4932406e..7a5aabe0b 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
* John McCutchan
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index 20472cd10..f2cf7ff8b 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
* http://www.baisoku.org/
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 71e4b2c78..5f2be8899 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
/*
diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c
index 110de2b2e..020488a90 100644
--- a/src/combined/wavpack_combined.c
+++ b/src/combined/wavpack_combined.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
*
diff --git a/src/combined/wavpack_combined.h b/src/combined/wavpack_combined.h
index 7688f91df..a591d26a0 100644
--- a/src/combined/wavpack_combined.h
+++ b/src/combined/wavpack_combined.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
*
diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c
index 0929d1b8e..e174bd809 100644
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
*
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 5f2f57d49..597a7a6bc 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
*
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 85402484e..36971507b 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
/*
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index aca048c8f..fe004faa8 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_decoder.c,v 1.22 2007/01/19 01:48:05 dgp85 Exp $
*
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index d43affead..0959a5411 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_decoder.c,v 1.26 2006/07/10 22:08:30 dgp85 Exp $
*
@@ -123,23 +123,22 @@ static void yuv2frame(yuv_buffer *yuv, vo_frame_t *frame, int offset_x, int offs
static int collect_data (theora_decoder_t *this, buf_element_t *buf ) {
/* Assembles an ogg_packet which was sent with send_ogg_packet over xinebuffers */
/* this->done, this->rejected, this->op and this->decoder->flags are needed*/
- int op_size = sizeof (ogg_packet);
if (buf->decoder_flags & BUF_FLAG_FRAME_START) {
this->done=0; /*start from the beginnig*/
this->reject=0;/*new packet - new try*/
/*copy the ogg_packet struct and the sum, correct the adress of the packet*/
- xine_fast_memcpy (&this->op, buf->content, op_size);
+ xine_fast_memcpy (&this->op, buf->content, sizeof(ogg_packet));
this->op.packet=this->packet;
- readin_op (this, buf->content + op_size, buf->size - op_size );
+ readin_op (this, buf->content + sizeof(ogg_packet), buf->size - sizeof(ogg_packet) );
/*read the rest of the data*/
} else {
if (this->done==0 || this->reject) {
/*we are starting to collect an packet without the beginnig
- reject the rest*/
+ reject the rest*/
printf ("libtheora: rejecting packet\n");
this->reject=1;
return 0;
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index 344bd8ed4..394f76048 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_decoder.c,v 1.48 2006/12/04 13:59:38 dgp85 Exp $
*
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 21:49:31 +0000