Merge commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:29:26 +0000 (18:29 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:30:22 +0000 (18:30 -0300)
* commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3':
  qsvdec: Fix memory leak on error

This commit is a noop, see b6f80b16d1a82463a77352b8756e1cdcaa3a33d0

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge