diff options
author | James Almer <jamrial@gmail.com> | 2017-10-28 14:01:25 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-28 14:01:25 -0300 |
commit | 1e5669457f6072f6bfb0e15aaeb958b44a742833 (patch) | |
tree | 004b1dcd69363383317153cffa069df46d19d176 /libavformat | |
parent | f4bda7e305385d080e233a79a578c0db926aa10d (diff) | |
parent | 9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d (diff) |
Merge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d'
* commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d':
avformat: Free the internal codec context at the end
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/utils.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6dbc48d54d..0ab2f61eb0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3875,12 +3875,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - // close codecs which were opened in try_decode_frame() - for (i = 0; i < ic->nb_streams; i++) { - st = ic->streams[i]; - avcodec_close(st->internal->avctx); - } - ff_rfps_calculate(ic); for (i = 0; i < ic->nb_streams; i++) { @@ -4071,6 +4065,7 @@ find_stream_info_err: st = ic->streams[i]; if (st->info) av_freep(&st->info->duration_error); + avcodec_close(ic->streams[i]->internal->avctx); av_freep(&ic->streams[i]->info); av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf); av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt); |