[FFmpeg-cvslog] Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
Michael Niedermayer
git at videolan.org
Thu Feb 20 23:37:45 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 23:27:13 2014 +0100| [5176e9651bda5182df008a1226e2484fdd809985] | committer: Michael Niedermayer
Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
configure: Move cpunop into ARCH_EXT_LIST_X86
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5176e9651bda5182df008a1226e2484fdd809985
---
More information about the ffmpeg-cvslog
mailing list