Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935'
authorJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:50:57 +0000 (22:50 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:50:57 +0000 (22:50 -0300)
commit0a320f7e7a9bf8e6e9e9c33adfdb5bea743bfd52
treef80111bebc6ba20dfeb06960ff41269baf20093d
parentcb2205863b9505441956a459fffe7fed212ea54a
parent2eb396b175e55e515aa6a13c5b1789a2a18d3935
Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935'

* commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935':
  hwcontext: Fix memory leak on derived frame allocation failure

Merged-by: James Almer <jamrial@gmail.com>
libavutil/hwcontext.c