ffmpeg | branch: master | Reimar Döffinger <reimar.doeffin...@gmx.de> | Wed Sep 13 18:59:21 2017 +0200| [a149fa97d9501d3a1749232cc60b6f122d9d2de8] | committer: Reimar Döffinger
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.doeffin...@gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a149fa97d9501d3a1749232cc60b6f122d9d2de8 --- libavcodec/frame_thread_encoder.c | 3 +++ 1 file changed, 3 insertions(+) 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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
