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

[gkovacs]

Author: gkovacs
Date: Sun Jul  5 22:42:36 2009
New Revision: 4622

Log:
fixed alphabetical order

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

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Sun Jul  5 22:38:14 2009	(r4621)
+++ concat/libavformat/Makefile.diff	Sun Jul  5 22:42:36 2009	(r4622)
@@ -1,12 +1,12 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 8e8a869..1dee9be 100644
+index 8e8a869..d2aaf47 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
+@@ -34,6 +34,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
+ OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
+ OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
+ OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o
 +OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o pls.o playlist.o concat.o concatgen.o datanode.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
+ OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
+ OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
+ OBJS-$(CONFIG_DAUD_MUXER)                += daud.o

Modified: concat/libavformat/allformats.c.diff
==============================================================================
--- concat/libavformat/allformats.c.diff	Sun Jul  5 22:38:14 2009	(r4621)
+++ concat/libavformat/allformats.c.diff	Sun Jul  5 22:42:36 2009	(r4622)
@@ -1,14 +1,28 @@
 diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index ad47631..433be82 100644
+index ad47631..83d7d21 100644
 --- a/libavformat/allformats.c
 +++ b/libavformat/allformats.c
-@@ -66,6 +66,9 @@ void av_register_all(void)
+@@ -66,6 +66,7 @@ void av_register_all(void)
      REGISTER_DEMUXER  (BFI, bfi);
      REGISTER_DEMUXER  (C93, c93);
      REGISTER_DEMUXER  (CAVSVIDEO, cavsvideo);
 +    REGISTER_DEMUXER  (CONCAT, concat);
-+    REGISTER_DEMUXER  (M3U, m3u);
-+    REGISTER_DEMUXER  (PLS, pls);
      REGISTER_MUXER    (CRC, crc);
      REGISTER_MUXDEMUX (DAUD, daud);
      REGISTER_MUXDEMUX (DIRAC, dirac);
+@@ -98,6 +99,7 @@ void av_register_all(void)
+     REGISTER_MUXER    (IPOD, ipod);
+     REGISTER_DEMUXER  (ISS, iss);
+     REGISTER_DEMUXER  (LMLM4, lmlm4);
++    REGISTER_DEMUXER  (M3U, m3u);
+     REGISTER_MUXDEMUX (M4V, m4v);
+     REGISTER_MUXDEMUX (MATROSKA, matroska);
+     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);
+@@ -155,6 +157,7 @@ void av_register_all(void)
+     REGISTER_MUXDEMUX (PCM_U16BE, pcm_u16be);
+     REGISTER_MUXDEMUX (PCM_U16LE, pcm_u16le);
+     REGISTER_MUXDEMUX (PCM_U8,    pcm_u8);
++    REGISTER_DEMUXER  (PLS, pls);
+     REGISTER_MUXER    (PSP, psp);
+     REGISTER_DEMUXER  (PVA, pva);
+     REGISTER_DEMUXER  (QCP, qcp);