[FFmpeg-soc] [soc]: r2064 - aac/ffmpeg.patch

[andoma]

Author: andoma
Date: Tue Apr  1 16:54:03 2008
New Revision: 2064

Log:
100l: Accidentally lost some parts of ffmpeg.patch, revive it.
 


Modified:
   aac/ffmpeg.patch

Modified: aac/ffmpeg.patch
==============================================================================
--- aac/ffmpeg.patch	(original)
+++ aac/ffmpeg.patch	Tue Apr  1 16:54:03 2008
@@ -10,3 +10,28 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
  OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3.o mdct.o fft.o
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
+Index: libavcodec/allcodecs.c
+===================================================================
+--- libavcodec/allcodecs.c	(revision 12665)
++++ libavcodec/allcodecs.c	(working copy)
+@@ -177,6 +177,7 @@
+     REGISTER_ENCDEC  (ZMBV, zmbv);
+ 
+     /* audio codecs */
++    REGISTER_DECODER (AAC, aac);
+     REGISTER_DECODER (MPEG4AAC, mpeg4aac);
+     REGISTER_ENCDEC  (AC3, ac3);
+     REGISTER_DECODER (ALAC, alac);
+Index: libavformat/mov.c
+===================================================================
+--- libavformat/mov.c	(revision 12665)
++++ libavformat/mov.c	(working copy)
+@@ -1278,7 +1278,7 @@
+         st->codec->width= 0; /* let decoder init width/height */
+         st->codec->height= 0;
+         break;
+-#ifdef CONFIG_LIBFAAD
++#if defined(CONFIG_LIBFAAD) || defined(CONFIG_AAC_DECODER)
+     case CODEC_ID_AAC:
+ #endif
+ #ifdef CONFIG_VORBIS_DECODER