Commit 2efc2b53 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7d65e960'

* commit '7d65e960':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 56090b5b 7d65e960
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