diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 6 | ||||
| -rw-r--r-- | libavformat/avidec.c | 8 | ||||
| -rw-r--r-- | libavformat/mpegenc.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 387189a178..1f695d1f31 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -24,17 +24,17 @@ #define REGISTER_MUXER(X,x) { \ extern AVOutputFormat x##_muxer; \ - if(ENABLE_##X##_MUXER) av_register_output_format(&x##_muxer); } + if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); } #define REGISTER_DEMUXER(X,x) { \ extern AVInputFormat x##_demuxer; \ - if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } + if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); } #define REGISTER_MUXDEMUX(X,x) REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x) #define REGISTER_PROTOCOL(X,x) { \ extern URLProtocol x##_protocol; \ - if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol); } + if(CONFIG_##X##_PROTOCOL) register_protocol(&x##_protocol); } /* If you do not call this function, then you can select exactly which formats you want to support */ diff --git a/libavformat/avidec.c b/libavformat/avidec.c index c25a7941db..6997ebc3b8 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -350,7 +350,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) av_freep(&s->streams[0]->codec->extradata); av_freep(&s->streams[0]); s->nb_streams = 0; - if (ENABLE_DV_DEMUXER) { + if (CONFIG_DV_DEMUXER) { avi->dv_demux = dv_init_demux(s); if (!avi->dv_demux) goto fail; @@ -636,7 +636,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) int64_t i, sync; void* dstr; - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { size = dv_get_packet(avi->dv_demux, pkt); if (size >= 0) return size; @@ -721,7 +721,7 @@ resync: memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256); } - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { dstr = pkt->destruct; size = dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size); @@ -1012,7 +1012,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp // av_log(NULL, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp); - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { /* One and only one real stream for DV in AVI, and it has video */ /* offsets. Calling with other stream indexes should have failed */ /* the av_index_search_timestamp call above. */ 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; |