Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aarch64: port neon clobber test from arm

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

2 files changed, 32 insertions, 0 deletions

diff --git a/libavresample/aarch64/Makefile b/libavresample/aarch64/Makefile
new file mode 100644
index 0000000000..13ba193a47
--- /dev/null
+++ b/libavresample/aarch64/Makefile
@@ -0,0 +1 @@
+OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o
diff --git a/libavresample/aarch64/neontest.c b/libavresample/aarch64/neontest.c
new file mode 100644
index 0000000000..e956ee6b0d
--- /dev/null
+++ b/libavresample/aarch64/neontest.c
@@ -0,0 +1,31 @@
+/*
+ * check NEON registers for clobbers
+ * 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/aarch64/neontest.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))
+{
+    testneonclobbers(avresample_convert, avr, output, out_plane_size,
+                     out_samples, input, in_plane_size, in_samples);
+}