remove now useless ifdef

Originally committed as revision 9383 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 07e21ad..fd4e5b0 100644 (file)
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -535,7 +535,6 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
     return dts;
 }
 
-#ifdef CONFIG_MPEGPS_DEMUXER
 AVInputFormat mpegps_demuxer = {
     "mpeg",
     "MPEG PS format",
@@ -548,4 +547,3 @@ AVInputFormat mpegps_demuxer = {
     mpegps_read_dts,
     .flags = AVFMT_SHOW_IDS,
 };
-#endif

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 464a1f7..c862074 100644 (file)
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -76,7 +76,6 @@ typedef struct {
 
 } MpegMuxContext;
 
-#ifdef CONFIG_MUXERS
 AVOutputFormat mpeg1system_muxer;
 AVOutputFormat mpeg1vcd_muxer;
 AVOutputFormat mpeg2vob_muxer;
@@ -1219,7 +1218,6 @@ static int mpeg_mux_end(AVFormatContext *ctx)
     }
     return 0;
 }
-#endif //CONFIG_MUXERS
 
 #ifdef CONFIG_MPEG1SYSTEM_MUXER
 AVOutputFormat mpeg1system_muxer = {