diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:32:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:32:17 +0100 |
| commit | 42d3fea65f787eed356c47336c240edb7b0c879d (patch) | |
| tree | 5d7f8da372ac4e8dbc4c19b01e0500baa15d2312 /libavutil/x86/cpu.c | |
| parent | 264441715b132344e15f27f6a5740645d5146f56 (diff) | |
| parent | af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1 (diff) | |
Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
asink_nullsink: plug a memory leak.
x86: h264_idct: port to cpuflags
x86: cpu: Drop unused HAVE_RWEFLAGS condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/cpu.c')
| -rw-r--r-- | libavutil/x86/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 3fee152095..a3a5239159 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -69,7 +69,7 @@ #define cpuid_test ff_cpu_cpuid_test -#elif HAVE_INLINE_ASM || HAVE_RWEFLAGS +#elif HAVE_INLINE_ASM static int cpuid_test(void) { |