Commit 822f1a79 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'e9bfff1c'

* commit 'e9bfff1c':
  lavc: free buffer_frame/pkt on avcodec_open2() failure

This commit is a noop, see 27adf9f9.

Only reordered to reduce diff.
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 53587ca4 e9bfff1c
...@@ -1728,9 +1728,9 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1728,9 +1728,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
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_packet_free(&avctx->internal->buffer_pkt);
av_frame_free(&avctx->internal->buffer_frame);
av_frame_free(&avctx->internal->to_free); av_frame_free(&avctx->internal->to_free);
av_frame_free(&avctx->internal->buffer_frame);
av_packet_free(&avctx->internal->buffer_pkt);
av_freep(&avctx->internal->pool); av_freep(&avctx->internal->pool);
} }
av_freep(&avctx->internal); av_freep(&avctx->internal);
......
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