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

[jbr]

Author: jbr
Date: Mon Aug 25 03:49:27 2008
New Revision: 3606

Log:
update to current FFmpeg SVN r14960

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

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

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Mon Aug 25 03:49:27 2008
@@ -1,6 +1,6 @@
 Index: libavcodec/ac3dec.h
 ===================================================================
---- libavcodec/ac3dec.h	(revision 14954)
+--- libavcodec/ac3dec.h	(revision 14960)
 +++ libavcodec/ac3dec.h	(working copy)
 @@ -82,7 +82,7 @@
      int phase_flags[18];                    ///< phase flags                            (phsflg)
@@ -30,7 +30,7 @@ Index: libavcodec/ac3dec.h
  #endif /* FFMPEG_AC3DEC_H */
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 14954)
+--- libavcodec/Makefile	(revision 14960)
 +++ libavcodec/Makefile	(working copy)
 @@ -27,7 +27,7 @@
  
@@ -41,36 +41,3 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
  OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
  OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
-Index: libavcodec/ac3dec_data.c
-===================================================================
---- libavcodec/ac3dec_data.c	(revision 14954)
-+++ libavcodec/ac3dec_data.c	(working copy)
-@@ -87,18 +87,19 @@
- /**
-  * Table E3.6, Gk=2 & Gk=4, B
-  * Large mantissa inverse quantization, negative mantissa remapping offsets
-+ * Table values from the spec are right-shifted by 8 to simplify calculations.
-  * ff_eac3_gaq_remap_3_4_b[hebap-8][Gk=2,4]
-  */
- const int16_t ff_eac3_gaq_remap_2_4_b[9][2] = {
--    {  -5461, -1170},
--    { -11703, -4915},
--    { -14199, -6606},
--    { -15327, -7412},
--    { -15864, -7805},
--    { -16126, -7999},
--    { -16255, -8096},
--    { -16320, -8144},
--    { -16352, -8168}
-+    { -22,  -5 },
-+    { -46, -20 },
-+    { -56, -26 },
-+    { -60, -29 },
-+    { -62, -31 },
-+    { -63, -32 },
-+    { -64, -32 },
-+    { -64, -32 },
-+    { -64, -32 },
- };
- 
- static const int16_t vq_hebap1[4][6] = {