Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '50079a6aa9'

Browse source 
* commit '50079a6aa9':
  lavc: do not leak the internal frame if opening the codec fails

Conflicts:
	libavcodec/utils.c

See: 8b285f03f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-06 15:43:24 +01:00
commit 3328d105f7
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/utils.c
View file

@ -1498,8 +1498,8 @@ free_and_end:
av_dict_free(&tmp); av_dict_free(&tmp);
av_freep(&avctx->priv_data); av_freep(&avctx->priv_data);
if (avctx->internal) { if (avctx->internal) {
av_freep(&avctx->internal->pool);
av_frame_free(&avctx->internal->to_free); av_frame_free(&avctx->internal->to_free);
av_freep(&avctx->internal->pool);
} }
av_freep(&avctx->internal); av_freep(&avctx->internal);
avctx->codec = NULL; avctx->codec = NULL;