Commit ab074ab9 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/pthread: fix ffv1 with 2 threads

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3da726f1
...@@ -651,9 +651,10 @@ int ff_thread_decode_frame(AVCodecContext *avctx, ...@@ -651,9 +651,10 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
* If we're still receiving the initial packets, don't return a frame. * If we're still receiving the initial packets, don't return a frame.
*/ */
if (fctx->delaying) { if (fctx->next_decoding > (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1)))
if (fctx->next_decoding >= (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1))) fctx->delaying = 0; fctx->delaying = 0;
if (fctx->delaying) {
*got_picture_ptr=0; *got_picture_ptr=0;
if (avpkt->size) if (avpkt->size)
return avpkt->size; return avpkt->size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment