[FFmpeg-cvslog] avcodec/pthread: fix ffv1 with 2 threads

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 00:17:48 2013 +0200| [ab074ab9fef8e218f922725ae1e54d0e61661de8] | committer: Michael Niedermayer

avcodec/pthread: fix ffv1 with 2 threads

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab074ab9fef8e218f922725ae1e54d0e61661de8
---

 libavcodec/pthread.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 6942c1e..5074f4a 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -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 (fctx->delaying) {
-        if (fctx->next_decoding >= (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1))) fctx->delaying = 0;
+    if (fctx->next_decoding > (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1)))
+        fctx->delaying = 0;
 
+    if (fctx->delaying) {
         *got_picture_ptr=0;
         if (avpkt->size)
             return avpkt->size;