Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

* commit '99e20125232d40ea239a5b54d26bbfe526506114':
  x86/arm: Add clobber tests to libavresample

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 33 insertions, 0 deletions

diff --git a/libavresample/x86/Makefile b/libavresample/x86/Makefile
index 2e8786fb90..0ca2d79045 100644
--- a/libavresample/x86/Makefile
+++ b/libavresample/x86/Makefile
@@ -2,6 +2,8 @@ OBJS      += x86/audio_convert_init.o                                   \
              x86/audio_mix_init.o                                       \
              x86/dither_init.o                                          \
 
+OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
+
 YASM-OBJS += x86/audio_convert.o                                        \
              x86/audio_mix.o                                            \
              x86/dither.o                                               \
diff --git a/libavresample/x86/w64xmmtest.c b/libavresample/x86/w64xmmtest.c
new file mode 100644
index 0000000000..0f42bd185c
--- /dev/null
+++ b/libavresample/x86/w64xmmtest.c
@@ -0,0 +1,31 @@
+/*
+ * check XMM registers for clobbers on Win64
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavresample/avresample.h"
+#include "libavutil/x86/w64xmmtest.h"
+
+wrap(avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
+                        int out_plane_size, int out_samples, uint8_t **input,
+                        int in_plane_size, int in_samples))
+{
+    testxmmclobbers(avresample_convert, avr, output, out_plane_size,
+                    out_samples, input, in_plane_size, in_samples);
+}