From 3e60501f311c50bf234033f206c19d34d889df01 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 5 Dec 2012 20:08:01 +0100 Subject: [PATCH] h264: slice-mt: check master context for valid current_picture_ptr Fixes errors in slice based multithreading introduced in 0b300daad2f5. CC: libav-stable@libav.org (cherry picked from commit 5945c7b35d9169caf9ecef1c419eebdebb909e60) Signed-off-by: Diego Biurrun --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 547cf3d1c9..c4853253e5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2952,7 +2952,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->picture_structure = last_pic_structure; s->dropable = last_pic_dropable; return AVERROR_INVALIDDATA; - } else if (!s->current_picture_ptr) { + } else if (!s0->current_picture_ptr) { av_log(s->avctx, AV_LOG_ERROR, "unset current_picture_ptr on %d. slice\n", h0->current_slice + 1);