[FFmpeg-cvslog] Merge commit 'd81fb63d87692765c004c19934b49427df434a07'
Michael Niedermayer
git at videolan.org
Wed May 6 21:46:06 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 6 21:21:00 2015 +0200| [20ce69e5f85dd29cc850a98060972821d69bfd3a] | committer: Michael Niedermayer
Merge commit 'd81fb63d87692765c004c19934b49427df434a07'
* commit 'd81fb63d87692765c004c19934b49427df434a07':
fate: Add a PICT 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=20ce69e5f85dd29cc850a98060972821d69bfd3a
---
More information about the ffmpeg-cvslog
mailing list