ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Thu Jan 28 17:19:06 2016 +0000| [1a2d6055beed34547fbfa1f7753e9a557058cf04] | committer: Derek Buitenhuis
avcodec/frame_thread_encoder: Check the private option for huffy's context modelling Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a2d6055beed34547fbfa1f7753e9a557058cf04 --- libavcodec/frame_thread_encoder.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index f4d35f9..04c9a0e 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -136,9 +136,15 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ if (avctx->codec_id == AV_CODEC_ID_HUFFYUV || avctx->codec_id == AV_CODEC_ID_FFVHUFF) { int warn = 0; + int context_model = 0; + AVDictionaryEntry *con = av_dict_get(options, "context", NULL, AV_DICT_MATCH_CASE); + + if (con && con->value) + context_model = atoi(con->value); + if (avctx->flags & AV_CODEC_FLAG_PASS1) warn = 1; - else if(avctx->context_model > 0) { + else if(context_model > 0) { AVDictionaryEntry *t = av_dict_get(options, "non_deterministic", NULL, AV_DICT_MATCH_CASE); warn = !t || !t->value || !atoi(t->value) ? 1 : 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
