virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavc/libopusdec: Allow avcodec_open2 to call .close

Browse Source 
If there is a decoder initialization failure detected in avcodec_open2
after .init is called, allow graceful decoder .close to prevent leaking
libopus decoder allocations.

BUG=828526

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Matt Wolenetz 2018-04-10 13:59:25 -07:00 committed by Michael Niedermayer
parent aea610b0d6
commit e43e97f0e0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libopusdec.c
View File

@ -160,7 +160,10 @@ static av_cold int libopus_decode_close(AVCodecContext *avc)
{ {
struct libopus_context *opus = avc->priv_data; struct libopus_context *opus = avc->priv_data;
if (opus->dec) {
opus_multistream_decoder_destroy(opus->dec); opus_multistream_decoder_destroy(opus->dec);
opus->dec = NULL;
}
return 0; return 0;
} }
@ -252,6 +255,7 @@ AVCodec ff_libopus_decoder = {
.decode = libopus_decode, .decode = libopus_decode,
.flush = libopus_flush, .flush = libopus_flush,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },