ffmpeg | branch: release/2.7 | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Wed Jun 17 19:02:15 2015 +0200| [250cf2d4dae0baf14ecdd6744c9555d24a6668ff] | committer: Michael Niedermayer
vp9: don't retain NULL as segmentation_map This fixes segmentation faults, which were introduced in commit 4ba8f327. Reviewed-by: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> (cherry picked from commit d216b9debd9843d31732ebb7344a85b3cd96b7cc) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=250cf2d4dae0baf14ecdd6744c9555d24a6668ff --- libavcodec/vp9.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index d5147e5..b9d207a 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
