[FFmpeg-soc] [soc]: r3885 - amr/20071204_ffmpeg-amr.diff

[diego]

Author: diego
Date: Mon Dec 15 11:17:04 2008
New Revision: 3885

Log:
Update glue diff to match FFmpeg HEAD.


Modified:
   amr/20071204_ffmpeg-amr.diff

Modified: amr/20071204_ffmpeg-amr.diff
==============================================================================
--- amr/20071204_ffmpeg-amr.diff	(original)
+++ amr/20071204_ffmpeg-amr.diff	Mon Dec 15 11:17:04 2008
@@ -2,22 +2,22 @@ Index: libavcodec/Makefile
 ===================================================================
 --- libavcodec/Makefile	(revision 11162)
 +++ libavcodec/Makefile	(working copy)
-@@ -36,6 +36,7 @@
- OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3.o mdct.o fft.o
+@@ -37,6 +36,7 @@
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
  OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
-+OBJS-$(CONFIG_AMRNB_DECODER)             += amrnbfloatdec.o
+ OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
++OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbfloatdec.o
  OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o
- OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o
+ OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o
 Index: libavcodec/allcodecs.c
 ===================================================================
 --- libavcodec/allcodecs.c	(revision 11162)
 +++ libavcodec/allcodecs.c	(working copy)
-@@ -173,6 +173,7 @@
-     REGISTER_DECODER (MPEG4AAC, mpeg4aac);
+@@ -177,6 +173,7 @@
+     REGISTER_DECODER (AAC, aac);
      REGISTER_ENCDEC  (AC3, ac3);
-     REGISTER_DECODER (ALAC, alac);
+     REGISTER_ENCDEC  (ALAC, alac);
 +    REGISTER_DECODER (AMRNB, amrnb);
      REGISTER_DECODER (APE, ape);
      REGISTER_DECODER (ATRAC3, atrac3);