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)
commitac6cb666d92009bae92362d133c47a886fe46a7f
tree7e53bd475f2e84e40e9dd579e17d18af71ff4069
parent54b0c04ae3a4073b9764358b925b0b73da3a9e09
parentf33b5ba63eee96c9d1c7f0e568169cb0c3694238
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp56: release frames on error

Conflicts:
libavcodec/vp56.c

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