highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vp9: fix pixel format changes with threading

Browse Source
This commit is contained in:
Hendrik Leppkes 2015-12-06 16:44:32 +01:00
parent 21fbc41214
commit cd1b7e2bd7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vp9.c
View File

@ -4228,7 +4228,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
// detect size changes in other threads // detect size changes in other threads
if (s->intra_pred_data[0] && if (s->intra_pred_data[0] &&
(!ssrc->intra_pred_data[0] || s->cols != ssrc->cols || (!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); free_buffers(s);
} }
@ -4260,6 +4260,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
s->bytesperpixel = ssrc->bytesperpixel; s->bytesperpixel = ssrc->bytesperpixel;
s->bpp = ssrc->bpp; s->bpp = ssrc->bpp;
s->bpp_index = ssrc->bpp_index; 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->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.lf_delta, &ssrc->s.h.lf_delta, sizeof(s->s.h.lf_delta));
memcpy(&s->s.h.segmentation.feat, &ssrc->s.h.segmentation.feat, memcpy(&s->s.h.segmentation.feat, &ssrc->s.h.segmentation.feat,