Merge remote-tracking branch 'qatar/master'
* qatar/master: vp56: release frames on error Conflicts: libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ac6cb666d9
* qatar/master: vp56: release frames on error Conflicts: libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>