summaryrefslogtreecommitdiff
path: root/libavcodec/vp9.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-12-06 16:44:32 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-12-07 09:23:18 +0100
commitcd1b7e2bd758165127106769a588a6384e41e9aa (patch)
treee33e476479d1c300e168ae7a2aca8d3617efebbe /libavcodec/vp9.c
parent21fbc41214b8c61d3627e45c22771ded7943d86d (diff)
vp9: fix pixel format changes with threading
Diffstat (limited to 'libavcodec/vp9.c')
-rw-r--r--libavcodec/vp9.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index d8888c0489..5b90c13d88 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,