[FFmpeg-cvslog] Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
Michael Niedermayer
git at videolan.org
Sat Jul 5 20:17:57 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 5 20:12:31 2014 +0200| [19b79c1429c4234b6ca60ca21e0ed8a152db1343] | committer: Michael Niedermayer
Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
x86: build: Only compile FDCT code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19b79c1429c4234b6ca60ca21e0ed8a152db1343
---
More information about the ffmpeg-cvslog
mailing list