[FFmpeg-cvslog] Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 11 15:03:14 2016 +0100| [8cd1323103d3a287eeba5cac32e00cd7314c02bd] | committer: Derek Buitenhuis

Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'

This commit is a no-op. We already did this.

* commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596':
  vc1dec: Fix leak on error for array allocations

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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