generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9: fix segmentation map retention if segmentation is turned off.

Browse Source
This commit is contained in:
Ronald S. Bultje 2015-09-02 12:21:12 -04:00
parent 8d25a11dc7
commit eaff36c973
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vp9.c
View File

@ -3997,8 +3997,9 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
int size = pkt->size; int size = pkt->size;
VP9Context *s = ctx->priv_data; VP9Context *s = ctx->priv_data;
int res, tile_row, tile_col, i, ref, row, col; int res, tile_row, tile_col, i, ref, row, col;
int retain_segmap_ref = s->segmentation.enabled && !s->segmentation.update_map int retain_segmap_ref = s->frames[REF_FRAME_SEGMAP].segmentation_map &&
&& s->frames[REF_FRAME_SEGMAP].segmentation_map; !(s->segmentation.enabled &&
(s->segmentation.update_map || s->keyframe || s->intraonly));
ptrdiff_t yoff, uvoff, ls_y, ls_uv; ptrdiff_t yoff, uvoff, ls_y, ls_uv;
AVFrame *f; AVFrame *f;
int bytesperpixel; int bytesperpixel;
@ -4330,6 +4331,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
s->invisible = ssrc->invisible; s->invisible = ssrc->invisible;
s->keyframe = ssrc->keyframe; s->keyframe = ssrc->keyframe;
s->intraonly = ssrc->intraonly;
s->ss_v = ssrc->ss_v; s->ss_v = ssrc->ss_v;
s->ss_h = ssrc->ss_h; s->ss_h = ssrc->ss_h;
s->segmentation.enabled = ssrc->segmentation.enabled; s->segmentation.enabled = ssrc->segmentation.enabled;