[FFmpeg-cvslog] Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
Michael Niedermayer
git at videolan.org
Sun Jan 18 01:59:00 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:42:09 2015 +0100| [b5b36e45b3282818b8374c8385a9c353a6ac3ff4] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5b36e45b3282818b8374c8385a9c353a6ac3ff4
---
More information about the ffmpeg-cvslog
mailing list