diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 20:08:01 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 23:16:37 +0100 |
| commit | 5945c7b35d9169caf9ecef1c419eebdebb909e60 (patch) | |
| tree | 35389ba4670a5cbb7eda9c8a77a80c639dfffb62 /libavcodec | |
| parent | a8cb1746c5b6307b2e820f965a7da8d907893b38 (diff) | |
| download | ffmpeg-5945c7b35d9169caf9ecef1c419eebdebb909e60.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 942cb15ae0..0525caaae4 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2624,7 +2624,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); |