summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-06-21 09:49:20 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-06-21 09:49:20 +0000
commitc4f27438efb4cd6b52ddeb620ab0fe3c3fe0ef4b (patch)
tree9a11cf43f61d43ccae80add47641f1d76735fefe /libavformat
parent2abe5a01c87df3d30304ffecbd272d55fab9ae6e (diff)
remove now useless ifdef
Originally committed as revision 9383 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpeg.c2
-rw-r--r--libavformat/mpegenc.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 07e21ad43f..fd4e5b04bb 100644
--- 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 464a1f7bd7..c862074a51 100644
--- 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 = {