virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes errors in slice based multithreading introduced in 0b300daad2.

CC: libav-stable@libav.org
This commit is contained in:
Janne Grunau
2012-12-05 20:08:01 +01:00
parent a8cb1746c5
commit 5945c7b35d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -2624,7 +2624,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s->picture_structure = last_pic_structure; s->picture_structure = last_pic_structure;
s->dropable = last_pic_dropable; s->dropable = last_pic_dropable;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (!s->current_picture_ptr) { } else if (!s0->current_picture_ptr) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"unset current_picture_ptr on %d. slice\n", "unset current_picture_ptr on %d. slice\n",
h0->current_slice + 1); h0->current_slice + 1);