Commit e6831c08 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '338ed3ed'

* commit '338ed3ed':
  ffv1: Pass correct pointers to av_free()

Conflicts:
	libavcodec/ffv1.c

See: a3963cc8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a570e812 338ed3ed
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