Commit 3328d105 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '50079a6a'

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

Conflicts:
	libavcodec/utils.c

See: 8b285f03Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 76c63bc5 50079a6a
...@@ -1498,8 +1498,8 @@ free_and_end: ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment