Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'
authorClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:25:56 +0000 (19:25 +0100)
committerClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:27:56 +0000 (19:27 +0100)
* 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@pkh.me>
1  2 
libavcodec/utils.c

Simple merge