diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /liba52/liba52_changes.diff | |
parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'liba52/liba52_changes.diff')
-rw-r--r-- | liba52/liba52_changes.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index e5008a77cc..9840a05f02 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -1412,7 +1412,7 @@ +void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias); + +#ifdef RUNTIME_CPUDETECT -+#undef HAVE_3DNOWEX ++#undef HAVE_3DNOWEXT +#endif typedef struct complex_s { @@ -1862,9 +1862,9 @@ +const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }}; +const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 }; + -+#undef HAVE_3DNOWEX ++#undef HAVE_3DNOWEXT +#include "imdct_3dnow.h" -+#define HAVE_3DNOWEX ++#define HAVE_3DNOWEXT +#include "imdct_3dnow.h" + +void |