[FFmpeg-soc] [soc]: r4963 - in concat/libavformat: concat.c m3u.c pls.c xspf.c

[gkovacs]

Author: gkovacs
Date: Fri Aug  7 00:52:29 2009
New Revision: 4963

Log:
remove unnecessary ifdefs

Modified:
   concat/libavformat/concat.c
   concat/libavformat/m3u.c
   concat/libavformat/pls.c
   concat/libavformat/xspf.c

Modified: concat/libavformat/concat.c
==============================================================================
--- concat/libavformat/concat.c	Fri Aug  7 00:48:26 2009	(r4962)
+++ concat/libavformat/concat.c	Fri Aug  7 00:52:29 2009	(r4963)
@@ -74,7 +74,6 @@ AVInputFormat* ff_concat_alloc_demuxer(v
     return cdm;
 }
 
-#if CONFIG_CONCAT_DEMUXER
 AVInputFormat concat_demuxer = {
     "concat",
     NULL_IF_CONFIG_SMALL("CONCAT format"),
@@ -95,4 +94,3 @@ AVInputFormat concat_demuxer = {
     NULL, //metadata_conv
     NULL, //next
 };
-#endif

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Fri Aug  7 00:48:26 2009	(r4962)
+++ concat/libavformat/m3u.c	Fri Aug  7 00:52:29 2009	(r4963)
@@ -88,7 +88,6 @@ static int m3u_read_header(AVFormatConte
     return 0;
 }
 
-#if CONFIG_M3U_DEMUXER
 AVInputFormat m3u_demuxer = {
     "m3u",
     NULL_IF_CONFIG_SMALL("CONCAT M3U format"),
@@ -109,4 +108,3 @@ AVInputFormat m3u_demuxer = {
     NULL, //metadata_conv
     NULL, //next
 };
-#endif

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Fri Aug  7 00:48:26 2009	(r4962)
+++ concat/libavformat/pls.c	Fri Aug  7 00:52:29 2009	(r4963)
@@ -115,7 +115,6 @@ static int pls_read_header(AVFormatConte
     return 0;
 }
 
-#if CONFIG_PLS_DEMUXER
 AVInputFormat pls_demuxer = {
     "pls",
     NULL_IF_CONFIG_SMALL("CONCAT PLS format"),
@@ -136,4 +135,3 @@ AVInputFormat pls_demuxer = {
     NULL, //metadata_conv
     NULL, //next
 };
-#endif

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Fri Aug  7 00:48:26 2009	(r4962)
+++ concat/libavformat/xspf.c	Fri Aug  7 00:52:29 2009	(r4963)
@@ -116,7 +116,6 @@ static int xspf_read_header(AVFormatCont
     return 0;
 }
 
-#if CONFIG_XSPF_DEMUXER
 AVInputFormat xspf_demuxer = {
     "xspf",
     NULL_IF_CONFIG_SMALL("CONCAT XSPF format"),
@@ -137,4 +136,3 @@ AVInputFormat xspf_demuxer = {
     NULL, //metadata_conv
     NULL, //next
 };
-#endif