diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-28 04:02:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-28 14:51:42 +0100 |
| commit | bb7a7111562b3c488be2ee1c41a39a913eed6497 (patch) | |
| tree | b9ba5f0f22767a8808673b1d5ea0ec2400e3ab67 /libavcodec/frame_thread_encoder.c | |
| parent | 644c32ea4b8092e2bb19083df1f3d7ea9f277b78 (diff) | |
| download | ffmpeg-bb7a7111562b3c488be2ee1c41a39a913eed6497.tar.gz | |
avcodec/huffyuvenc: frame multi-threading support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/frame_thread_encoder.c')
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index b9acefc110..687f23a17d 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -133,6 +133,13 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ if(avctx->thread_count <= 1) return 0; + if (avctx->codec_id == AV_CODEC_ID_HUFFYUV || + avctx->codec_id == AV_CODEC_ID_FFVHUFF) { + // huffyuv doesnt support these with multiple frame threads currently + if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1)) + return 0; + } + if(avctx->thread_count > MAX_THREADS) return AVERROR(EINVAL); |