diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-08-27 08:26:14 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-08-31 13:19:14 +0200 |
commit | 297d9cb3dc6850b83ba4e95789143833cecdfd87 (patch) | |
tree | 102aa9f94dd1fe2e4e44d044fa6fd3a4c44417a0 /libavcodec/mpegvideo_enc.c | |
parent | d2f119a1f2d2d72b0001fcdf2cc051b022bf6528 (diff) | |
download | ffmpeg-297d9cb3dc6850b83ba4e95789143833cecdfd87.tar.gz |
mpeg12enc: add intra_vlc private option.
Deprecate CODEC_FLAG2_INTRA_VLC.
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6ca48d8fb3..42fd6609c9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -336,7 +336,9 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) s->obmc= !!(s->flags & CODEC_FLAG_OBMC); s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER); s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN); +#if FF_API_MPEGVIDEO_GLOBAL_OPTS s->intra_vlc_format= !!(s->flags2 & CODEC_FLAG2_INTRA_VLC); +#endif s->q_scale_type= !!(s->flags2 & CODEC_FLAG2_NON_LINEAR_QUANT); if(avctx->rc_max_rate && !avctx->rc_buffer_size){ |