From d216b9debd9843d31732ebb7344a85b3cd96b7cc Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Wed, 17 Jun 2015 19:02:15 +0200 Subject: vp9: don't retain NULL as segmentation_map This fixes segmentation faults, which were introduced in commit 4ba8f327. Reviewed-by: Ronald S. Bultje Signed-off-by: Andreas Cadhalpun --- libavcodec/vp9.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 4e2ed53745..9d9326c247 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3988,7 +3988,8 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame, int size = pkt->size; VP9Context *s = ctx->priv_data; 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->segmentation.enabled && !s->segmentation.update_map + && s->frames[REF_FRAME_SEGMAP].segmentation_map; ptrdiff_t yoff, uvoff, ls_y, ls_uv; AVFrame *f; int bytesperpixel; -- cgit v1.2.3