diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-05 20:08:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 04:45:04 +0100 |
| commit | 3ab5f7dc137438e281af19218871da71a52e21be (patch) | |
| tree | 277445f7ba52a5b0c2156a0ef2f69cdcb49f1f87 /libavcodec/h264.c | |
| parent | 24c62ea7a5df44804be88150aa0c45e6796b5da9 (diff) | |
| download | ffmpeg-3ab5f7dc137438e281af19218871da71a52e21be.tar.gz | |
h264: slice-mt: check master context for valid current_picture_ptr
Fixes errors in slice based multithreading introduced in 0b300daad2f5.
Diffstat (limited to 'libavcodec/h264.c')
| -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 a93d07ebce..41845ca284 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2709,7 +2709,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); |