ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Jan 15
02:52:47 2015 +0100| [cd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff] | committer:
Michael Niedermayer
Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'
* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
png: improve signature check
Conflicts:
libavcodec/pngdec.c
See: 8a08503b78f59d61cf98b9deb99363e3e07d8599
See: 0a3589bf2f0a23b0eb68664fbb00078abe882a88
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
