diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-23 19:48:58 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-27 02:23:43 +0200 |
| commit | 312d4467f379d34257f60aeb7ad88fb29b11caeb (patch) | |
| tree | 06d35d144aa93a69d9c17022781355b0a4b4662c /libavcodec | |
| parent | 18e55de45a4d0ea197eaeae3a3a9daea186159b9 (diff) | |
| download | ffmpeg-312d4467f379d34257f60aeb7ad88fb29b11caeb.tar.gz | |
avcodec/encode: Simplify check for frame-threaded encoder
AVCodecInternal.frame_thread_encoder is only set iff
active_thread_type is FF_THREAD_FRAME.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/encode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 9f413095e4..01b59bbf70 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -192,7 +192,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) if (!frame->buf[0]) { if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY || - (avci->frame_thread_encoder && avctx->active_thread_type & FF_THREAD_FRAME))) + avci->frame_thread_encoder)) return AVERROR_EOF; // Flushing is signaled with a NULL frame @@ -203,8 +203,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) av_assert0(codec->cb_type == FF_CODEC_CB_TYPE_ENCODE); - if (CONFIG_FRAME_THREAD_ENCODER && - avci->frame_thread_encoder && (avctx->active_thread_type & FF_THREAD_FRAME)) + if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) /* This might modify frame, but it doesn't matter, because * the frame properties used below are not used for video * (due to the delay inherent in frame threaded encoding, it makes |