[FFmpeg-cvslog] Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
Michael Niedermayer
git at videolan.org
Mon Apr 7 03:18:17 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 7 03:07:49 2014 +0200| [072278c777986fc87dba5b0c372e19115b711a35] | committer: Michael Niedermayer
Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
libxvid: add working lumimasking and variance AQ
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=072278c777986fc87dba5b0c372e19115b711a35
---
More information about the ffmpeg-cvslog
mailing list