ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Dec 6 16:44:32 2015 +0100| [cd1b7e2bd758165127106769a588a6384e41e9aa] | committer: Hendrik Leppkes
vp9: fix pixel format changes with threading > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd1b7e2bd758165127106769a588a6384e41e9aa --- libavcodec/vp9.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index d8888c0..5b90c13 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -4228,7 +4228,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo // detect size changes in other threads if (s->intra_pred_data[0] && (!ssrc->intra_pred_data[0] || s->cols != ssrc->cols || - s->rows != ssrc->rows || s->bpp != ssrc->bpp)) { + s->rows != ssrc->rows || s->bpp != ssrc->bpp || s->pix_fmt != ssrc->pix_fmt)) { free_buffers(s); } @@ -4260,6 +4260,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo s->bytesperpixel = ssrc->bytesperpixel; s->bpp = ssrc->bpp; s->bpp_index = ssrc->bpp_index; + s->pix_fmt = ssrc->pix_fmt; memcpy(&s->prob_ctx, &ssrc->prob_ctx, sizeof(s->prob_ctx)); memcpy(&s->s.h.lf_delta, &ssrc->s.h.lf_delta, sizeof(s->s.h.lf_delta)); memcpy(&s->s.h.segmentation.feat, &ssrc->s.h.segmentation.feat, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
