generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/pthread: fix ffv1 with 2 threads

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-17 00:17:48 +02:00
parent 3da726f188
commit ab074ab9fe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread.c
View File

@ -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;