Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 14:01:33 +0000 (15:01 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 14:01:43 +0000 (15:01 +0100)
commit015ca20030be077c4bc084244e3fc267e1b72e52
tree467054fb88e1c6f73fc372eebd7cfcda23d8bd80
parente06f5c6f94835374fc34eb2be4fa3d338d6a7dce
parentf91d94bdfc3f5f83ff0be4d19d10d0a35697386f
Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'

* commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f':
  vc1dec: Properly call deinit function on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/vc1dec.c