mirror of https://git.ffmpeg.org/ffmpeg.git
remove now useless ifdef
Originally committed as revision 9383 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
2abe5a01c8
commit
c4f27438ef
|
@ -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 = {
|
||||||
mpegps_read_dts,
|
mpegps_read_dts,
|
||||||
.flags = AVFMT_SHOW_IDS,
|
.flags = AVFMT_SHOW_IDS,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
|
@ -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)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif //CONFIG_MUXERS
|
|
||||||
|
|
||||||
#ifdef CONFIG_MPEG1SYSTEM_MUXER
|
#ifdef CONFIG_MPEG1SYSTEM_MUXER
|
||||||
AVOutputFormat mpeg1system_muxer = {
|
AVOutputFormat mpeg1system_muxer = {
|
||||||
|
|
Loading…
Reference in New Issue