1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00

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:
Michael Niedermayer 2012-12-15 14:18:13 +01:00
commit ac6cb666d9

Diff Content Not Available