Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: use numeric ID for Tag_ABI_align_preserved
  segment: Pass the interrupt callback on to the chained AVFormatContext, too
  ARM: bswap: drop armcc version of av_bswap16()
  ARM: set Tag_ABI_align_preserved in all asm files

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

14 files changed, 2 insertions, 36 deletions

diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index 92a37571c9..d665ab3d20 100644
--- a/libavcodec/arm/dsputil_arm.S
+++ b/libavcodec/arm/dsputil_arm.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 #if HAVE_ARMV5TE
 function ff_prefetch_arm, export=1
         subs            r2,  r2,  #1
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index fac431d393..0c54b52987 100644
--- a/libavcodec/arm/dsputil_armv6.S
+++ b/libavcodec/arm/dsputil_armv6.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 .macro  call_2x_pixels  type, subp
 function ff_\type\()_pixels16\subp\()_armv6, export=1
         push            {r0-r3, lr}
diff --git a/libavcodec/arm/dsputil_neon.S b/libavcodec/arm/dsputil_neon.S
index 66b3f17d3d..e4bd03eda9 100644
--- a/libavcodec/arm/dsputil_neon.S
+++ b/libavcodec/arm/dsputil_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_clear_block_neon, export=1
         vmov.i16        q0,  #0
         .rept           8
diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S
index 83fc124a29..55d070e01c 100644
--- a/libavcodec/arm/fmtconvert_neon.S
+++ b/libavcodec/arm/fmtconvert_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_float_to_int16_neon, export=1
         subs            r2,  r2,  #8
         vld1.64         {d0-d1},  [r1,:128]!
diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
index 612aec36d9..1b349ced58 100644
--- a/libavcodec/arm/h264idct_neon.S
+++ b/libavcodec/arm/h264idct_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_h264_idct_add_neon, export=1
         vld1.64         {d0-d3},  [r1,:128]
 
diff --git a/libavcodec/arm/int_neon.S b/libavcodec/arm/int_neon.S
index bce84516c6..6b28a97af8 100644
--- a/libavcodec/arm/int_neon.S
+++ b/libavcodec/arm/int_neon.S
@@ -21,7 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
         .fpu neon
 
 function ff_scalarproduct_int16_neon, export=1
diff --git a/libavcodec/arm/mdct_fixed_neon.S b/libavcodec/arm/mdct_fixed_neon.S
index 08a388777a..c77be59c65 100644
--- a/libavcodec/arm/mdct_fixed_neon.S
+++ b/libavcodec/arm/mdct_fixed_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 .macro  prerot          dst, rt
         lsr             r3,  r6,  #2            @ n4
         add             \rt, r4,  r6,  lsr #1   @ revtab + n4
diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S
index a8f376d760..e481cd1307 100644
--- a/libavcodec/arm/mdct_neon.S
+++ b/libavcodec/arm/mdct_neon.S
@@ -21,8 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 #define ff_fft_calc_neon X(ff_fft_calc_neon)
 
 function ff_imdct_half_neon, export=1
diff --git a/libavcodec/arm/rdft_neon.S b/libavcodec/arm/rdft_neon.S
index dcd3eee0b4..781d976354 100644
--- a/libavcodec/arm/rdft_neon.S
+++ b/libavcodec/arm/rdft_neon.S
@@ -21,8 +21,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_rdft_calc_neon, export=1
         push            {r4-r8,lr}
 
diff --git a/libavcodec/arm/synth_filter_neon.S b/libavcodec/arm/synth_filter_neon.S
index 0e38ffcf3a..5417be7d53 100644
--- a/libavcodec/arm/synth_filter_neon.S
+++ b/libavcodec/arm/synth_filter_neon.S
@@ -20,8 +20,6 @@
 
 #include "libavutil/arm/asm.S"
 
-        preserve8
-
 function ff_synth_filter_float_neon, export=1
         push            {r3-r11,lr}
 
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 05d0db7515..7931e2e926 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -357,6 +357,7 @@ static int seg_write_header(AVFormatContext *s)
         goto fail;
     }
 
+    oc->interrupt_callback = s->interrupt_callback;
     seg->avf = oc;
 
     oc->streams = s->streams;
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 449077c1ab..bb7c383875 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -52,14 +52,7 @@
 
         .syntax unified
 T       .thumb
-
-.macro  require8 val=1
-ELF     .eabi_attribute 24, \val
-.endm
-
-.macro  preserve8 val=1
-ELF     .eabi_attribute 25, \val
-.endm
+ELF     .eabi_attribute 25, 1           @ Tag_ABI_align_preserved
 
 .macro  function name, export=0
         .set            .Lpic_idx, 0
diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h
index fd18e0d221..c10c35fa16 100644
--- a/libavutil/arm/bswap.h
+++ b/libavutil/arm/bswap.h
@@ -26,13 +26,6 @@
 #ifdef __ARMCC_VERSION
 
 #if HAVE_ARMV6
-#define av_bswap16 av_bswap16
-static av_always_inline av_const unsigned av_bswap16(unsigned x)
-{
-    __asm { rev16 x, x }
-    return x;
-}
-
 #define av_bswap32 av_bswap32
 static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
 {
diff --git a/libavutil/arm/float_dsp_neon.S b/libavutil/arm/float_dsp_neon.S
index 03b164388f..4aa6f838dd 100644
--- a/libavutil/arm/float_dsp_neon.S
+++ b/libavutil/arm/float_dsp_neon.S
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "asm.S"
 
-        preserve8
-
 function ff_vector_fmul_neon, export=1
         subs            r3,  r3,  #8
         vld1.32         {d0-d3},  [r1,:128]!