[FFmpeg-cvslog] Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'
Michael Niedermayer
git at videolan.org
Mon Apr 7 03:27:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 7 03:19:41 2014 +0200| [a7a82f2f22afaac9155ef46b8ff274ad4573b20e] | committer: Michael Niedermayer
Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'
* commit 'c389a804943095ebf078daec6b64690d2c97069c':
libxvid: Add SSIM displaying through a libxvidcore plugin
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: 3b3c1ed0768af874c624cc555fbbd1fcea370200
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7a82f2f22afaac9155ef46b8ff274ad4573b20e
---
More information about the ffmpeg-cvslog
mailing list