diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-12 14:58:46 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-15 18:10:31 +0200 |
| commit | 70f303548252eb4767c4ee85f365645e92899a71 (patch) | |
| tree | c142fd95b109fcb7efd9540c23b1838d955b14bd | |
| parent | 30408768335403114d1ed2e80f8032683f85602a (diff) | |
| download | ffmpeg-70f303548252eb4767c4ee85f365645e92899a71.tar.gz | |
avcodec/avcodec: Remove redundant check
At this point active_thread_type is set iff active_thread_type
is set to FF_THREAD_FRAME iff AVCodecInternal.frame_thread_encoder
is set.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/avcodec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 0451f57f82..29643199be 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -283,8 +283,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ret < 0) goto free_and_end; - if (HAVE_THREADS - && !(avci->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { + if (HAVE_THREADS && !avci->frame_thread_encoder) { /* Frame-threaded decoders call FFCodec.init for their child contexts. */ lock_avcodec(codec2); ret = ff_thread_init(avctx); |