[FFmpeg-soc] [soc]: r3584 - in eac3: ac3dec.c checkout.sh ffmpeg.patch

[jbr]

Author: jbr
Date: Sun Aug 24 17:26:51 2008
New Revision: 3584

Log:
fix copying of default coupling band structure

Modified:
   eac3/ac3dec.c
   eac3/checkout.sh
   eac3/ffmpeg.patch

Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c	(original)
+++ eac3/ac3dec.c	Sun Aug 24 17:26:51 2008
@@ -823,8 +823,8 @@ static int decode_audio_block(AC3DecodeC
                 }
             } else if (!blk) {
                 memcpy(s->cpl_band_struct,
-                       &ff_eac3_default_cpl_band_struct[cpl_begin_freq],
-                       sizeof(int)*(s->num_cpl_subbands-1));
+                       &ff_eac3_default_cpl_band_struct[cpl_begin_freq+1],
+                       s->num_cpl_subbands-1);
             }
             s->cpl_band_struct[s->num_cpl_subbands-1] = 0;
 

Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh	(original)
+++ eac3/checkout.sh	Sun Aug 24 17:26:51 2008
@@ -4,7 +4,7 @@ echo "checking out ffmpeg svn"
 for i in $FILES Makefile ac3enc.c ac3dec.h avcodec.h utils.c; do
     rm -f ffmpeg/libavcodec/$i
 done
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14912
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14945
 echo "patching ffmpeg"
 cd ffmpeg
 patch -p0 <../ffmpeg.patch

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Sun Aug 24 17:26:51 2008
@@ -1,7 +1,16 @@
 Index: libavcodec/ac3dec.h
 ===================================================================
---- libavcodec/ac3dec.h	(revision 14912)
+--- libavcodec/ac3dec.h	(revision 14945)
 +++ libavcodec/ac3dec.h	(working copy)
+@@ -82,7 +82,7 @@
+     int phase_flags[18];                    ///< phase flags                            (phsflg)
+     int num_cpl_subbands;                   ///< number of coupling sub bands           (ncplsubnd)
+     int num_cpl_bands;                      ///< number of coupling bands               (ncplbnd)
+-    int cpl_band_struct[18];                ///< coupling band structure                (cplbndstrc)
++    uint8_t cpl_band_struct[18];            ///< coupling band structure                (cplbndstrc)
+     int firstchincpl;                       ///< first channel in coupling
+     int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states      (firstcplcos)
+     int cpl_coords[AC3_MAX_CHANNELS][18];   ///< coupling coordinates                   (cplco)
 @@ -168,4 +168,16 @@
  ///@}
  } AC3DecodeContext;
@@ -21,7 +30,7 @@ Index: libavcodec/ac3dec.h
  #endif /* FFMPEG_AC3DEC_H */
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 14912)
+--- libavcodec/Makefile	(revision 14945)
 +++ libavcodec/Makefile	(working copy)
 @@ -27,7 +27,7 @@