diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:16:40 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-05 23:16:40 +0300 |
commit | 0ef8b61999590160e7f0ff381cec5f0ce5aeb06a (patch) | |
tree | bf16e94d23f1c872f80dd4a242e80eb2f35487aa /configure | |
parent | 0c6ec6275342d022619b40f98acaa8978134cd92 (diff) | |
parent | 9b04897e76aa15aef0d27618b550c605cc02f08d (diff) | |
download | mpv-0ef8b61999590160e7f0ff381cec5f0ce5aeb06a.tar.bz2 mpv-0ef8b61999590160e7f0ff381cec5f0ce5aeb06a.tar.xz |
Merge svn changes r31306, r31307
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1965,6 +1965,9 @@ EOF cc_check -march=native && proc=native fi # --- AMD processors --- + if test "$proc" = "amdfam10"; then + cc_check -march=$proc $cpuopt=$proc || proc=k8 + fi if test "$proc" = "k8"; then cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp fi @@ -7067,7 +7070,7 @@ if test "$_x264" = auto ; then cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 89 +#if X264_BUILD < 98 #error We do not support old versions of x264. Get the latest from git. #endif int main(void) { x264_encoder_open((void*)0); return 0; } |