mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-09 01:07:01 +02:00
pthread: Fix crash due to fctx->delaying not being cleared.
corrects invalid return when avpkt->size == 0. Reproducible with test case and ffplay -threads 2. Stack trace: http://pastebin.com/PexZ4Uc0 Test case: http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogm Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
e9dc616472
commit
a9d114dc8a
@ -614,11 +614,12 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
|
||||
* If we're still receiving the initial packets, don't return a frame.
|
||||
*/
|
||||
|
||||
if (fctx->delaying && avpkt->size) {
|
||||
if (fctx->delaying) {
|
||||
if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0;
|
||||
|
||||
*got_picture_ptr=0;
|
||||
return avpkt->size;
|
||||
if (avpkt->size)
|
||||
return avpkt->size;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user