Commit 70cbb473 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '60b05513'

* commit '60b05513':
  png_parser: fix size of chunk_lenght

Conflicts:
	libavcodec/png_parser.c

See: 2ee6dca3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 287eb699 60b05513
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