diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 20:08:01 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-01 07:37:14 -0700 |
| commit | 3e60501f311c50bf234033f206c19d34d889df01 (patch) | |
| tree | f114701c88f53ba0dee8fd2fcdd5b86c658d23a9 | |
| parent | 7585a6254bbb38148e4467793fc34211b79d5f7d (diff) | |
| download | ffmpeg-3e60501f311c50bf234033f206c19d34d889df01.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
(cherry picked from commit 5945c7b35d9169caf9ecef1c419eebdebb909e60)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -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 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); |