Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/avcodec: Move initializing frame-thrd encoder to encode_preinit

Browse source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-08-12 14:57:36 +02:00
parent c469c3c3b1
commit 3040876833
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/avcodec.c
View file

@ -283,12 +283,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (ret < 0) if (ret < 0)
goto free_and_end; goto free_and_end;
if (CONFIG_FRAME_THREAD_ENCODER && av_codec_is_encoder(avctx->codec)) {
ret = ff_frame_thread_encoder_init(avctx);
if (ret < 0)
goto free_and_end;
}
if (HAVE_THREADS if (HAVE_THREADS
&& !(avci->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { && !(avci->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) {
/* Frame-threaded decoders call FFCodec.init for their child contexts. */ /* Frame-threaded decoders call FFCodec.init for their child contexts. */

6
libavcodec/encode.c
View file

@ -668,6 +668,12 @@ int ff_encode_preinit(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (CONFIG_FRAME_THREAD_ENCODER) {
ret = ff_frame_thread_encoder_init(avctx);
if (ret < 0)
return ret;
}
return 0; return 0;
} }