[FFmpeg-soc] [soc]: r4962 - concat/libavformat/Makefile.diff

[gkovacs]

Author: gkovacs
Date: Fri Aug  7 00:48:26 2009
New Revision: 4962

Log:
separate concat, m3u, pls, and xspf in Makefile

Modified:
   concat/libavformat/Makefile.diff

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Thu Aug  6 20:00:38 2009	(r4961)
+++ concat/libavformat/Makefile.diff	Fri Aug  7 00:48:26 2009	(r4962)
@@ -1,12 +1,36 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 7838efe..2377365 100644
+index 7838efe..351b80b 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
 @@ -33,6 +33,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 xspf.o playlist.o concat.o concatgen.o
++OBJS-$(CONFIG_CONCAT_DEMUXER)            += playlist.o concat.o concatgen.o
  OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
  OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
  OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
+@@ -79,6 +80,7 @@ OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
+ OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
+ OBJS-$(CONFIG_ISS_DEMUXER)               += iss.o
+ OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
++OBJS-$(CONFIG_M3U_DEMUXER)               += m3u.o playlist.o concatgen.o
+ OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
+ OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
+ OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o riff.o isom.o
+@@ -169,6 +171,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_PLS_DEMUXER)               += pls.o playlist.o concatgen.o
+ OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
+ OBJS-$(CONFIG_QCP_DEMUXER)               += qcp.o
+ OBJS-$(CONFIG_R3D_DEMUXER)               += r3d.o
+@@ -223,6 +226,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
+ OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
+ OBJS-$(CONFIG_WV_DEMUXER)                += wv.o
+ OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
++OBJS-$(CONFIG_XSPF_DEMUXER)              += xspf.o playlist.o concatgen.o
+ OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.o
+ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
+