[FFmpeg-soc] [soc]: r3635 - in eac3: checkout.sh ffmpeg.patch

[jbr]

Author: jbr
Date: Wed Aug 27 03:50:49 2008
New Revision: 3635

Log:
update to current FFmpeg SVN r14991

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

Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh	(original)
+++ eac3/checkout.sh	Wed Aug 27 03:50:49 2008
@@ -1,10 +1,10 @@
 FILES="eac3dec.c ac3dec.c"
 
 echo "checking out ffmpeg svn"
-for i in $FILES Makefile ac3dec.h ac3dec_data.c; do
+for i in $FILES Makefile; do
     rm -f ffmpeg/libavcodec/$i
 done
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14960
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 14991
 echo "patching ffmpeg"
 cd ffmpeg
 patch -p0 <../ffmpeg.patch

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Wed Aug 27 03:50:49 2008
@@ -1,36 +1,6 @@
-Index: libavcodec/ac3dec.h
-===================================================================
---- libavcodec/ac3dec.h	(revision 14960)
-+++ 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;
- 
-+/**
-+ * Parse the E-AC-3 frame header.
-+ * This parses both the bit stream info and audio frame header.
-+ */
-+int ff_eac3_parse_header(AC3DecodeContext *s);
-+
-+/**
-+ * Decode mantissas in a single channel for the entire frame.
-+ * This is used when AHT mode is enabled.
-+ */
-+void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
-+
- #endif /* FFMPEG_AC3DEC_H */
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 14960)
+--- libavcodec/Makefile	(revision 14991)
 +++ libavcodec/Makefile	(working copy)
 @@ -27,7 +27,7 @@