summaryrefslogtreecommitdiff
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-27 22:24:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-11 20:17:45 +0200
commita0c0900e470fde0d6db360e555620476c2323895 (patch)
tree60824e71a3e02f95f380c83c98caba0cb11de939 /libavcodec/pthread.c
parent54602590d9e479e474db75cafa2e4b9f2799eafe (diff)
ffv1dec: Support frame threading with gop > 1
This is about 20-30% faster than slice threading Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 516e5fcfd0..6942c1ebf1 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -652,7 +652,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
*/
if (fctx->delaying) {
- if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0;
+ if (fctx->next_decoding >= (avctx->thread_count-1-(avctx->codec_id == AV_CODEC_ID_FFV1))) fctx->delaying = 0;
*got_picture_ptr=0;
if (avpkt->size)