vp9: don't retain NULL as segmentation_map

This fixes segmentation faults, which were introduced in commit 4ba8f32. Reviewed-by: Ronald S. Bultje <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]>
haasn · Jun 18, 2015 · d216b9d · d216b9d
1 parent f6c3f1e
commit d216b9d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;