RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d' 

* commit '9e4a5eb51b9f3b2bff0ef08e0074b7fe4893075d':
  avformat: Free the internal codec context at the end

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-28 14:01:25 -03:00
parent f4bda7e305 9e4a5eb51b
commit 1e5669457f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@ -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); ff_rfps_calculate(ic);
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
@ -4071,6 +4065,7 @@ find_stream_info_err:
st = ic->streams[i]; st = ic->streams[i];
if (st->info) if (st->info)
av_freep(&st->info->duration_error); av_freep(&st->info->duration_error);
avcodec_close(ic->streams[i]->internal->avctx);
av_freep(&ic->streams[i]->info); av_freep(&ic->streams[i]->info);
av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf); av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf);
av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt); av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt);