ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 11
23:16:15 2014 +0100| [70cbb473608b0746d0ca4a5614b038d8f722d476] | committer:
Michael Niedermayer
Merge commit '60b055133485891405722bc9722e2c74fc9764b8'
* commit '60b055133485891405722bc9722e2c74fc9764b8':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70cbb473608b0746d0ca4a5614b038d8f722d476
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
