Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Dec 2012 13:18:13 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Dec 2012 13:18:13 +0000 (14:18 +0100)
* qatar/master:
  vp56: release frames on error

Conflicts:
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge