diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2017-09-13 18:59:21 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2017-09-16 16:46:00 +0200 |
| commit | a149fa97d9501d3a1749232cc60b6f122d9d2de8 (patch) | |
| tree | a6ba733559be2c0ac1347dd06f7be495a814b5ed | |
| parent | 73bf0f42e3423265662fb9cab28fb5cc1c5ae1cb (diff) | |
| download | ffmpeg-a149fa97d9501d3a1749232cc60b6f122d9d2de8.tar.gz | |
avcodec/frame_thread_encoder: Fix AV_OPT_TYPE_STRING handling in avctx
This is the equivalent to what 7d317d4706b49d572a1eb5269438753be18362c7
did for the codec-specific options.
av_opt_copy has specific handling so it's fine that we already copied
the whole context before.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 35a37c4372..31a9fe9dae 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -199,6 +199,9 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ goto fail; tmpv = thread_avctx->priv_data; *thread_avctx = *avctx; + int ret = av_opt_copy(thread_avctx, avctx); + if (ret < 0) + goto fail; thread_avctx->priv_data = tmpv; thread_avctx->internal = NULL; if (avctx->codec->priv_class) { |