lavc: move decoder bsf init into decoder-specific code

[ffmpeg] / libavcodec / decode.c

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index c8e9be3a138cc548800128eee7996980b468b0fa..5a00aeedaefb4cc5f5c395b2120743e698e60874 100644 (file)
--- 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;
 }