[FFmpeg-soc] [soc]: r4607 - in concat/libavformat: Makefile.diff allformats.c.diff

[gkovacs]

Author: gkovacs
Date: Sat Jul  4 23:55:29 2009
New Revision: 4607

Log:
added diffs for allformats.c and Makefile

Modified:
   concat/libavformat/Makefile.diff
   concat/libavformat/allformats.c.diff

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Sat Jul  4 23:55:01 2009	(r4606)
+++ concat/libavformat/Makefile.diff	Sat Jul  4 23:55:29 2009	(r4607)
@@ -0,0 +1,12 @@
+diff --git a/libavformat/Makefile b/libavformat/Makefile
+index 8e8a869..adb8d8e 100644
+--- a/libavformat/Makefile
++++ b/libavformat/Makefile
+@@ -175,6 +175,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER)         += raw.o
+ OBJS-$(CONFIG_PCM_U32LE_MUXER)           += raw.o
+ OBJS-$(CONFIG_PCM_U8_DEMUXER)            += raw.o
+ OBJS-$(CONFIG_PCM_U8_MUXER)              += raw.o
++OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o playlist.o concat.o concatgen.o
+ OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o avc.o
+ OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
+ OBJS-$(CONFIG_QCP_DEMUXER)               += qcp.o

Modified: concat/libavformat/allformats.c.diff
==============================================================================
--- concat/libavformat/allformats.c.diff	Sat Jul  4 23:55:01 2009	(r4606)
+++ concat/libavformat/allformats.c.diff	Sat Jul  4 23:55:29 2009	(r4607)
@@ -0,0 +1,13 @@
+diff --git a/libavformat/allformats.c b/libavformat/allformats.c
+index ad47631..5773fe6 100644
+--- a/libavformat/allformats.c
++++ b/libavformat/allformats.c
+@@ -66,6 +66,8 @@ void av_register_all(void)
+     REGISTER_DEMUXER  (BFI, bfi);
+     REGISTER_DEMUXER  (C93, c93);
+     REGISTER_DEMUXER  (CAVSVIDEO, cavsvideo);
++    REGISTER_DEMUXER  (M3U, m3u);
++    REGISTER_DEMUXER  (CONCAT, concat);
+     REGISTER_MUXER    (CRC, crc);
+     REGISTER_MUXDEMUX (DAUD, daud);
+     REGISTER_MUXDEMUX (DIRAC, dirac);