[FFmpeg-devel] [PATCH] pthread: Fix crash due to fctx->delaying not being cleared.

[Dale Curtis]

Patch needs some work, hold on review please.

- dale

On Thu, Apr 12, 2012 at 4:57 PM, Dale Curtis <dalecurtis at chromium.org>wrote:

> Fix as suggested by Ronald (rbultje).
>
> - dale
>
>
> On Thu, Apr 12, 2012 at 4:56 PM, <dalecurtis at chromium.org> wrote:
>
>> From: Dale Curtis <dalecurtis at chromium.org>
>>
>> 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 at chromium.org>
>> ---
>>  libavcodec/pthread.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
>> index c23098f..8eebbb3 100644
>> --- a/libavcodec/pthread.c
>> +++ b/libavcodec/pthread.c
>> @@ -614,7 +614,7 @@ 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;
>> --
>> 1.7.7.3
>>
>>
>