diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:06:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 14:06:15 +0200 |
| commit | ec8f56efad2c1a150e822f6b11c54915446a2d09 (patch) | |
| tree | cdca1d57f0be58bd8dcb922344d9fc7559151c62 /libavcodec/mpegvideo_enc.c | |
| parent | 17a065cf204fb626b6940b1bc3df5d6ab9f4a468 (diff) | |
| parent | a75c2eb25a62105c09b48521aef429dc8a231637 (diff) | |
Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'
* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
lavc: make rc_eq into private options of mpegvideo encoders
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 76fb65480f..83c2b6831f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -958,6 +958,13 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->rc_qmod_amp = avctx->rc_qmod_amp; if (avctx->rc_qmod_freq) s->rc_qmod_freq = avctx->rc_qmod_freq; + + if (avctx->rc_eq) { + av_freep(&s->rc_eq); + s->rc_eq = av_strdup(avctx->rc_eq); + if (!s->rc_eq) + return AVERROR(ENOMEM); + } FF_ENABLE_DEPRECATION_WARNINGS #endif |