[FFmpeg-cvslog] h264: slice-mt: check master context for valid current_picture_ptr

[Janne Grunau]

ffmpeg | branch: release/0.10 | Janne Grunau <janne-libav at jannau.net> | Wed Dec  5 20:08:01 2012 +0100| [3e60501f311c50bf234033f206c19d34d889df01] | committer: Diego Biurrun

h264: slice-mt: check master context for valid current_picture_ptr

Fixes errors in slice based multithreading introduced in 0b300daad2f5.

CC: libav-stable at libav.org
(cherry picked from commit 5945c7b35d9169caf9ecef1c419eebdebb909e60)
Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e60501f311c50bf234033f206c19d34d889df01
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 547cf3d..c485325 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);