virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/ralf: Cleanup generically on init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-02-08 11:53:56 +01:00
parent ca73a2c826
commit 7743933a60
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/ralf.c
View File

@@ -163,49 +163,37 @@ static av_cold int decode_init(AVCodecContext *avctx)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ret = init_ralf_vlc(&ctx->sets[i].filter_params, filter_param_def[i], ret = init_ralf_vlc(&ctx->sets[i].filter_params, filter_param_def[i],
FILTERPARAM_ELEMENTS); FILTERPARAM_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
}
ret = init_ralf_vlc(&ctx->sets[i].bias, bias_def[i], BIAS_ELEMENTS); ret = init_ralf_vlc(&ctx->sets[i].bias, bias_def[i], BIAS_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
}
ret = init_ralf_vlc(&ctx->sets[i].coding_mode, coding_mode_def[i], ret = init_ralf_vlc(&ctx->sets[i].coding_mode, coding_mode_def[i],
CODING_MODE_ELEMENTS); CODING_MODE_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
}
for (j = 0; j < 10; j++) { for (j = 0; j < 10; j++) {
for (k = 0; k < 11; k++) { for (k = 0; k < 11; k++) {
ret = init_ralf_vlc(&ctx->sets[i].filter_coeffs[j][k], ret = init_ralf_vlc(&ctx->sets[i].filter_coeffs[j][k],
filter_coeffs_def[i][j][k], filter_coeffs_def[i][j][k],
FILTER_COEFFS_ELEMENTS); FILTER_COEFFS_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
} }
} }
}
for (j = 0; j < 15; j++) { for (j = 0; j < 15; j++) {
ret = init_ralf_vlc(&ctx->sets[i].short_codes[j], ret = init_ralf_vlc(&ctx->sets[i].short_codes[j],
short_codes_def[i][j], SHORT_CODES_ELEMENTS); short_codes_def[i][j], SHORT_CODES_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
} }
}
for (j = 0; j < 125; j++) { for (j = 0; j < 125; j++) {
ret = init_ralf_vlc(&ctx->sets[i].long_codes[j], ret = init_ralf_vlc(&ctx->sets[i].long_codes[j],
long_codes_def[i][j], LONG_CODES_ELEMENTS); long_codes_def[i][j], LONG_CODES_ELEMENTS);
if (ret < 0) { if (ret < 0)
decode_close(avctx);
return ret; return ret;
} }
} }
}
return 0; return 0;
} }
@@ -539,5 +527,5 @@ const AVCodec ff_ralf_decoder = {
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
}; };