diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 09:25:05 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-12 18:18:22 +0100 |
| commit | 0c71cc65266469253d531e8101a211ce8f26387c (patch) | |
| tree | 438496915e0616c9d32796aa4bc5461f358a201b /libavcodec/mpegvideo_enc.c | |
| parent | 0fd88d398896353074fee153259dbf3530ca423f (diff) | |
| download | ffmpeg-0c71cc65266469253d531e8101a211ce8f26387c.tar.gz | |
mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 84a5cdaac8..08484a7a9c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -498,8 +498,11 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) return -1; } - if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME | - CODEC_FLAG_ALT_SCAN)) && + if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME +#if FF_API_MPEGVIDEO_GLOBAL_OPTS + | CODEC_FLAG_ALT_SCAN +#endif + )) && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO) { av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n"); return -1; @@ -531,12 +534,14 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) return -1; } +#if FF_API_MPEGVIDEO_GLOBAL_OPTS if ((s->flags2 & CODEC_FLAG2_INTRA_VLC) && s->codec_id != CODEC_ID_MPEG2VIDEO) { av_log(avctx, AV_LOG_ERROR, "intra vlc table not supported by codec\n"); return -1; } +#endif if (s->flags & CODEC_FLAG_LOW_DELAY) { if (s->codec_id != CODEC_ID_MPEG2VIDEO) { @@ -570,8 +575,11 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO && - (s->codec_id != CODEC_ID_H263P || - !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))) { + (s->codec_id != CODEC_ID_H263P +#if FF_API_MPEGVIDEO_GLOBAL_OPTS + || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) +#endif + )) { av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n"); return -1; @@ -810,8 +818,8 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) s->progressive_frame = s->progressive_sequence = !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT | - CODEC_FLAG_INTERLACED_ME | - CODEC_FLAG_ALT_SCAN)); + CODEC_FLAG_INTERLACED_ME) || + s->alternate_scan); /* init */ if (MPV_common_init(s) < 0) |