Commit 02f1cca9 authored by bcoudurier's avatar bcoudurier

remove now useless ifdef

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9383 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e9379afc
...@@ -535,7 +535,6 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, ...@@ -535,7 +535,6 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,
return dts; return dts;
} }
#ifdef CONFIG_MPEGPS_DEMUXER
AVInputFormat mpegps_demuxer = { AVInputFormat mpegps_demuxer = {
"mpeg", "mpeg",
"MPEG PS format", "MPEG PS format",
...@@ -548,4 +547,3 @@ AVInputFormat mpegps_demuxer = { ...@@ -548,4 +547,3 @@ AVInputFormat mpegps_demuxer = {
mpegps_read_dts, mpegps_read_dts,
.flags = AVFMT_SHOW_IDS, .flags = AVFMT_SHOW_IDS,
}; };
#endif
...@@ -76,7 +76,6 @@ typedef struct { ...@@ -76,7 +76,6 @@ typedef struct {
} MpegMuxContext; } MpegMuxContext;
#ifdef CONFIG_MUXERS
AVOutputFormat mpeg1system_muxer; AVOutputFormat mpeg1system_muxer;
AVOutputFormat mpeg1vcd_muxer; AVOutputFormat mpeg1vcd_muxer;
AVOutputFormat mpeg2vob_muxer; AVOutputFormat mpeg2vob_muxer;
...@@ -1219,7 +1218,6 @@ static int mpeg_mux_end(AVFormatContext *ctx) ...@@ -1219,7 +1218,6 @@ static int mpeg_mux_end(AVFormatContext *ctx)
} }
return 0; return 0;
} }
#endif //CONFIG_MUXERS
#ifdef CONFIG_MPEG1SYSTEM_MUXER #ifdef CONFIG_MPEG1SYSTEM_MUXER
AVOutputFormat mpeg1system_muxer = { AVOutputFormat mpeg1system_muxer = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment