Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:42:09 +0000 (01:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:42:22 +0000 (01:42 +0100)
commitb5b36e45b3282818b8374c8385a9c353a6ac3ff4
tree6832f9f8e680a04412332decada0180d92bd9c08
parentf038623d534212c79f31434b0b071039c296a08c
parent4edbb0955e043d698dcc1b5073b6e714f9cc7960
Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4

* commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960':
  png_parser: fix size of chunk_lenght

Conflicts:
libavcodec/png_parser.c

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>