Commit 4fac4447 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ab3fdaa7'

* commit 'ab3fdaa7':
  yop: only set extradata size after it has been successfully allocated

Conflicts:
	libavformat/yop.c

See: a807c682Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 213e82b5 ab3fdaa7
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