aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/decode.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-03-09 12:00:09 +0100
committerAnton Khirnov <anton@khirnov.net>2021-03-16 11:09:44 +0100
commitb006a84a97e7c8131a9e561d6c642edef6215977 (patch)
treeb223374fca5397481e759c37c314f711cedc9e28 /libavcodec/decode.c
parent20aec597d05f1930dbd4e4c5ab8ee837dea5b5f3 (diff)
downloadffmpeg-b006a84a97e7c8131a9e561d6c642edef6215977.tar.gz
lavc: move decoder bsf init into decoder-specific code
Diffstat (limited to 'libavcodec/decode.c')
-rw-r--r--libavcodec/decode.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index c8e9be3a13..5a00aeedae 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -185,7 +185,7 @@ static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt)
return 0;
}
-int ff_decode_bsfs_init(AVCodecContext *avctx)
+static int decode_bsfs_init(AVCodecContext *avctx)
{
AVCodecInternal *avci = avctx->internal;
int ret;
@@ -2007,6 +2007,8 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
int ff_decode_preinit(AVCodecContext *avctx)
{
+ int ret = 0;
+
/* if the decoder init function was already called previously,
* free the already allocated subtitle_header before overwriting it */
av_freep(&avctx->subtitle_header);
@@ -2043,5 +2045,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
avctx->export_side_data |= AV_CODEC_EXPORT_DATA_MVS;
}
+ ret = decode_bsfs_init(avctx);
+ if (ret < 0)
+ return ret;
+
return 0;
}