Merge commit 'af7d13ee'

* commit 'af7d13ee': 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>

Merge commit 'af7d13ee'
* commit 'af7d13ee': 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>
42d3fea6 · Michael Niedermayer · 26444171 · af7d13ee · 42d3fea6 · 42d3fea6
Commit 42d3fea6 authored Nov 28, 2012 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 72 additions and 70 deletions

h264_idct.asm libavcodec/x86/h264_idct.asm +70 -69

asink_anullsink.c libavfilter/asink_anullsink.c +1 -0

cpu.c libavutil/x86/cpu.c +1 -1

No files found.
--- a/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
--- a/libavfilter/asink_anullsink.c
+++ b/libavfilter/asink_anullsink.c
@@ -24,6 +24,7 @@
 static int null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
 {
+    avfilter_unref_bufferp(&samplesref);
    return 0;
 }

--- 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)
 {