Commit ac6cb666 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp56: release frames on error

Conflicts:
	libavcodec/vp56.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 54b0c04a f33b5ba6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment