GitBross Home Explore Help
Register Sign In
sol_BMCMMXZh
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg
1
3
Fork 0
Files Issues 1 Wiki
Browse Source

avcodec/rkmppdec: Close decoder generically on init failure

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Andreas Rheinhardt 2 months ago
parent
b02f1129eb
commit
bdb81d9347
1 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 2
      libavcodec/rkmppdec.c

+ 1 - 2
libavcodec/rkmppdec.c
View File 

@@ -257,7 +257,6 @@ static av_cold int rkmpp_init_decoder(AVCodecContext *avctx)
 
 
 
 fail:
 
 fail:
 
     av_log(avctx, AV_LOG_ERROR, "Failed to initialize RKMPP decoder.\n");
 
     av_log(avctx, AV_LOG_ERROR, "Failed to initialize RKMPP decoder.\n");
 
-    rkmpp_close_decoder(avctx);
 
     return ret;
 
     return ret;
 
 }
 
 }
 
 
 
@@ -563,7 +562,7 @@ static const AVCodecHWConfigInternal *const rkmpp_hw_configs[] = {
 
         .hw_configs     = rkmpp_hw_configs, \
 
         .hw_configs     = rkmpp_hw_configs, \
 
         .bsfs           = BSFS, \
 
         .bsfs           = BSFS, \
 
         .p.wrapper_name = "rkmpp", \
 
         .p.wrapper_name = "rkmpp", \
 
-        .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \
 
+        .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, \
 
     };
 
     };
 
 
 
 RKMPP_DEC(h264,  AV_CODEC_ID_H264,          "h264_mp4toannexb")
 
 RKMPP_DEC(h264,  AV_CODEC_ID_H264,          "h264_mp4toannexb")