[FFmpeg-soc] [soc]: r4464 - aacenc/aac_enc.patch

[alexc]

Author: alexc
Date: Tue Jun 16 19:41:13 2009
New Revision: 4464

Log:
Update the patch against trunk.

Modified:
   aacenc/aac_enc.patch

Modified: aacenc/aac_enc.patch
==============================================================================
--- aacenc/aac_enc.patch	Tue Jun 16 19:00:34 2009	(r4463)
+++ aacenc/aac_enc.patch	Tue Jun 16 19:41:13 2009	(r4464)
@@ -2,10 +2,10 @@ diff --git a/libavcodec/Makefile b/libav
 index d4f6d1c..0ed9057 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -33,6 +33,7 @@
+@@ -36,6 +36,7 @@ OBJS-$(CONFIG_VDPAU)                   += vdpau.o
  
- # decoders/encoders
- OBJS-$(CONFIG_AAC_DECODER)             += aac.o aactab.o
+ # decoders/encoders/hardware accelerators
+ OBJS-$(CONFIG_AAC_DECODER)             += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o
 +OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mdct.o fft.o mpeg4audio.o
  OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o
  OBJS-$(CONFIG_AC3_DECODER)             += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
@@ -14,7 +14,7 @@ diff --git a/libavcodec/allcodecs.c b/li
 index 33a4242..6871496 100644
 --- a/libavcodec/allcodecs.c
 +++ b/libavcodec/allcodecs.c
-@@ -181,7 +181,7 @@
+@@ -195,7 +195,7 @@ void avcodec_register_all(void)
      REGISTER_ENCDEC  (ZMBV, zmbv);
  
      /* audio codecs */