[FFmpeg-cvslog] Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
Michael Niedermayer
git at videolan.org
Tue Dec 17 19:04:36 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 17 18:16:26 2013 +0100| [682b28b41098f4445581076c44fb8420306eacec] | committer: Michael Niedermayer
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
fate: add a pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=682b28b41098f4445581076c44fb8420306eacec
---
More information about the ffmpeg-cvslog
mailing list