diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 17:19:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 17:19:17 +0000 |
| commit | 49fb20cb8a5da4250c978bd8cea8bd841dc0594f (patch) | |
| tree | 142746aa8ae9cf412da3a61ac287c4d9deb7ca22 /libavformat/mpegenc.c | |
| parent | 7356aaa78626b34c3b2779c7af84c92111025ebf (diff) | |
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.
Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index e4fe6ca940..69063a8e43 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -297,12 +297,12 @@ static int mpeg_mux_init(AVFormatContext *ctx) int video_bitrate; s->packet_number = 0; - s->is_vcd = (ENABLE_MPEG1VCD_MUXER && ctx->oformat == &mpeg1vcd_muxer); - s->is_svcd = (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer); - s->is_mpeg2 = ((ENABLE_MPEG2VOB_MUXER && ctx->oformat == &mpeg2vob_muxer) || - (ENABLE_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer) || - (ENABLE_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer)); - s->is_dvd = (ENABLE_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer); + s->is_vcd = (CONFIG_MPEG1VCD_MUXER && ctx->oformat == &mpeg1vcd_muxer); + s->is_svcd = (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer); + s->is_mpeg2 = ((CONFIG_MPEG2VOB_MUXER && ctx->oformat == &mpeg2vob_muxer) || + (CONFIG_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer) || + (CONFIG_MPEG2SVCD_MUXER && ctx->oformat == &mpeg2svcd_muxer)); + s->is_dvd = (CONFIG_MPEG2DVD_MUXER && ctx->oformat == &mpeg2dvd_muxer); if(ctx->packet_size) s->packet_size = ctx->packet_size; |