Commit 8fc441ce authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c39f7eba'

* commit 'c39f7eba':
  truemotion2: Use av_freep properly in an error path

Conflicts:
	libavcodec/truemotion2.c

See: c54aa2fbMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 028f8c3e c39f7eba
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