[FFmpeg-cvslog] Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'
Michael Niedermayer
git at videolan.org
Wed Jan 15 20:30:45 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 15 20:05:18 2014 +0100| [221dc52d03e113bd394ea3c6746d4b5506bd7dd1] | committer: Michael Niedermayer
Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'
* commit 'dc4d726bab59f349d366916ba01df16289e5c81f':
build: Add separate hidden config option for the intrax8 code
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=221dc52d03e113bd394ea3c6746d4b5506bd7dd1
---
More information about the ffmpeg-cvslog
mailing list