[FFmpeg-soc] [soc]: r1809 - in eac3: ac3.h checkout.sh ffmpeg.patch

[jbr]

Author: jbr
Date: Wed Jan  9 04:03:32 2008
New Revision: 1809

Log:
remove ac3.h from soc svn and put the changes in ffmpeg.patch

Removed:
   eac3/ac3.h
Modified:
   eac3/checkout.sh
   eac3/ffmpeg.patch

Modified: eac3/checkout.sh
==============================================================================
--- eac3/checkout.sh	(original)
+++ eac3/checkout.sh	Wed Jan  9 04:03:32 2008
@@ -1,7 +1,7 @@
-FILES="ac3.c ac3.h eac3dec.c ac3dec.c ac3dec.h ac3dec_data.c ac3dec_data.h"
+FILES="ac3.c eac3dec.c ac3dec.c ac3dec.h ac3dec_data.c ac3dec_data.h"
 
 echo "checking out ffmpeg svn"
-for i in $FILES Makefile aac_ac3_parser.c aac_ac3_parser.h aac_parser.c ac3_parser.c allcodecs.c avcodec.h ../libavformat/allformats.h ../libavformat/raw.c allcodecs.h ac3enc.c ../ffmpeg.c; do
+for i in $FILES Makefile aac_ac3_parser.c aac_ac3_parser.h aac_parser.c ac3_parser.c allcodecs.c avcodec.h ../libavformat/allformats.h ../libavformat/raw.c allcodecs.h ac3enc.c ac3.h../ffmpeg.c; do
     rm -f ffmpeg/libavcodec/$i
 done
 svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 11479

Modified: eac3/ffmpeg.patch
==============================================================================
--- eac3/ffmpeg.patch	(original)
+++ eac3/ffmpeg.patch	Wed Jan  9 04:03:32 2008
@@ -61,6 +61,32 @@ Index: libavcodec/ac3_parser.c
      return hdr.frame_size;
  }
  
+Index: libavcodec/ac3.h
+===================================================================
+--- libavcodec/ac3.h	(revision 11479)
++++ libavcodec/ac3.h	(working copy)
+@@ -94,6 +94,7 @@
+     uint32_t bit_rate;
+     uint8_t channels;
+     uint16_t frame_size;
++    uint8_t num_blocks;
+     /** @} */
+ } AC3HeaderInfo;
+ 
+@@ -156,10 +157,12 @@
+  * @param[in]  end        ending bin location
+  * @param[in]  snr_offset SNR adjustment
+  * @param[in]  floor      noise floor
++ * @param[in]  bap_tab    look-up table for bit allocation pointers
+  * @param[out] bap        bit allocation pointers
+  */
+ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
+-                               int snr_offset, int floor, uint8_t *bap);
++                               int snr_offset, int floor,
++                               const uint8_t *bap_tab, uint8_t *bap);
+ 
+ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
+                                    int8_t *exp, int start, int end,
 Index: libavcodec/ac3enc.c
 ===================================================================
 --- libavcodec/ac3enc.c	(revision 11479)