Commit 3ffa3858 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '76d4c627'

* commit '76d4c627':
  webp: Make sure enough bytes are available

Conflicts:
	libavcodec/webp.c

See: 0762152fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0762152f 76d4c627
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