X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=libavcodec%2Fpthread.c;h=572471586d3bfb416f30ee85b40c5b79e7891b8b;hb=20dc527139b44ede4e0e35d6473f4c3993a71844;hp=e3bcd29b8b94361ced496adceea9fb292474313a;hpb=94d68a41fabb55dd8c7e59b88fe4a28a637d1e5f;p=ffmpeg diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index e3bcd29b8b9..572471586d3 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -45,7 +45,7 @@ */ static void validate_thread_parameters(AVCodecContext *avctx) { - int frame_threading_supported = (avctx->codec->capabilities & CODEC_CAP_FRAME_THREADS) + int frame_threading_supported = (avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS) && !(avctx->flags & AV_CODEC_FLAG_TRUNCATED) && !(avctx->flags & AV_CODEC_FLAG_LOW_DELAY) && !(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS); @@ -53,10 +53,10 @@ static void validate_thread_parameters(AVCodecContext *avctx) avctx->active_thread_type = 0; } else if (frame_threading_supported && (avctx->thread_type & FF_THREAD_FRAME)) { avctx->active_thread_type = FF_THREAD_FRAME; - } else if (avctx->codec->capabilities & CODEC_CAP_SLICE_THREADS && + } else if (avctx->codec->capabilities & AV_CODEC_CAP_SLICE_THREADS && avctx->thread_type & FF_THREAD_SLICE) { avctx->active_thread_type = FF_THREAD_SLICE; - } else if (!(avctx->codec->capabilities & CODEC_CAP_AUTO_THREADS)) { + } else if (!(avctx->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS)) { avctx->thread_count = 1; avctx->active_thread_type = 0; }