Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 12:09:26 +0000 (13:09 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 13:43:53 +0000 (14:43 +0100)
* commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0':
  lavc: add clobber tests for the new encoding/decoding API

The merge only re-order what we already have.

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
configure
libavcodec/aarch64/neontest.c
libavcodec/arm/neontest.c
libavcodec/x86/w64xmmtest.c

diff --cc configure
+++ b/configure
@@@ -6152,12 -4830,11 +6152,12 @@@ enabled neon_clobber_test &
                    -Wl,--wrap,avcodec_decode_subtitle2   \
                    -Wl,--wrap,avcodec_encode_audio2      \
                    -Wl,--wrap,avcodec_encode_video2      \
+                   -Wl,--wrap,avcodec_encode_subtitle    \
                    -Wl,--wrap,avcodec_send_packet        \
-                   -Wl,--wrap,avcodec_receive_frame      \
-                   -Wl,--wrap,avcodec_send_frame         \
                    -Wl,--wrap,avcodec_receive_packet     \
-                   -Wl,--wrap,avcodec_encode_subtitle    \
+                   -Wl,--wrap,avcodec_send_frame         \
+                   -Wl,--wrap,avcodec_receive_frame      \
 +                  -Wl,--wrap,swr_convert                \
                    -Wl,--wrap,avresample_convert ||
      disable neon_clobber_test
  
@@@ -6170,10 -4847,9 +6170,10 @@@ enabled xmm_clobber_test &
                    -Wl,--wrap,avcodec_encode_video2      \
                    -Wl,--wrap,avcodec_encode_subtitle    \
                    -Wl,--wrap,avcodec_send_packet        \
-                   -Wl,--wrap,avcodec_receive_frame      \
-                   -Wl,--wrap,avcodec_send_frame         \
                    -Wl,--wrap,avcodec_receive_packet     \
+                   -Wl,--wrap,avcodec_send_frame         \
+                   -Wl,--wrap,avcodec_receive_frame      \
 +                  -Wl,--wrap,swr_convert                \
                    -Wl,--wrap,avresample_convert         \
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
Simple merge
Simple merge
Simple merge