[FFmpeg-cvslog] Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Mar 18 19:25:56 2017 +0100| [822f1a7913da31760a9f15f49013b3446b3f6a5b] | committer: Clément Bœsch

Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'

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

This commit is a noop, see 27adf9f9cdbc6f1dc0a1292dc97490eec6f2f068.

Only reordered to reduce diff.

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=822f1a7913da31760a9f15f49013b3446b3f6a5b
---

 libavcodec/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 63a6349..84c28c8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1728,9 +1728,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
     av_dict_free(&tmp);
     av_freep(&avctx->priv_data);
     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->buffer_frame);
+        av_packet_free(&avctx->internal->buffer_pkt);
         av_freep(&avctx->internal->pool);
     }
     av_freep(&avctx->internal);


======================================================================