virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-10-03 13:34:57 +02:00
commit 7e5496fc41
14 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/dsputil_arm.S
View File

@ -22,8 +22,6 @@
#include "config.h" #include "config.h"
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
#if HAVE_ARMV5TE #if HAVE_ARMV5TE
function ff_prefetch_arm, export=1 function ff_prefetch_arm, export=1
subs r2, r2, #1 subs r2, r2, #1

2
libavcodec/arm/dsputil_armv6.S
View File

@ -20,8 +20,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
.macro call_2x_pixels type, subp .macro call_2x_pixels type, subp
function ff_\type\()_pixels16\subp\()_armv6, export=1 function ff_\type\()_pixels16\subp\()_armv6, export=1
push {r0-r3, lr} push {r0-r3, lr}

2
libavcodec/arm/dsputil_neon.S
View File

@ -22,8 +22,6 @@
#include "config.h" #include "config.h"
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
function ff_clear_block_neon, export=1 function ff_clear_block_neon, export=1
vmov.i16 q0, #0 vmov.i16 q0, #0
.rept 8 .rept 8

2
libavcodec/arm/fmtconvert_neon.S
View File

@ -22,8 +22,6 @@
#include "config.h" #include "config.h"
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
function ff_float_to_int16_neon, export=1 function ff_float_to_int16_neon, export=1
subs r2, r2, #8 subs r2, r2, #8
vld1.64 {d0-d1}, [r1,:128]! vld1.64 {d0-d1}, [r1,:128]!

2
libavcodec/arm/h264idct_neon.S
View File

@ -20,8 +20,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
function ff_h264_idct_add_neon, export=1 function ff_h264_idct_add_neon, export=1
vld1.64 {d0-d3}, [r1,:128] vld1.64 {d0-d3}, [r1,:128]

1
libavcodec/arm/int_neon.S
View File

@ -21,7 +21,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
.fpu neon .fpu neon
function ff_scalarproduct_int16_neon, export=1 function ff_scalarproduct_int16_neon, export=1

2
libavcodec/arm/mdct_fixed_neon.S
View File

@ -20,8 +20,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
.macro prerot dst, rt .macro prerot dst, rt
lsr r3, r6, #2 @ n4 lsr r3, r6, #2 @ n4
add \rt, r4, r6, lsr #1 @ revtab + n4 add \rt, r4, r6, lsr #1 @ revtab + n4

2
libavcodec/arm/mdct_neon.S
View File

@ -21,8 +21,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
#define ff_fft_calc_neon X(ff_fft_calc_neon) #define ff_fft_calc_neon X(ff_fft_calc_neon)
function ff_imdct_half_neon, export=1 function ff_imdct_half_neon, export=1

2
libavcodec/arm/rdft_neon.S
View File

@ -21,8 +21,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
function ff_rdft_calc_neon, export=1 function ff_rdft_calc_neon, export=1
push {r4-r8,lr} push {r4-r8,lr}

2
libavcodec/arm/synth_filter_neon.S
View File

@ -20,8 +20,6 @@
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
preserve8
function ff_synth_filter_float_neon, export=1 function ff_synth_filter_float_neon, export=1
push {r3-r11,lr} push {r3-r11,lr}

1
libavformat/segment.c
View File

@ -357,6 +357,7 @@ static int seg_write_header(AVFormatContext *s)
goto fail; goto fail;
} }
oc->interrupt_callback = s->interrupt_callback;
seg->avf = oc; seg->avf = oc;
oc->streams = s->streams; oc->streams = s->streams;

9
libavutil/arm/asm.S
View File

@ -52,14 +52,7 @@
.syntax unified .syntax unified
T .thumb T .thumb
ELF .eabi_attribute 25, 1 @ Tag_ABI_align_preserved
.macro require8 val=1
ELF .eabi_attribute 24, \val
.endm
.macro preserve8 val=1
ELF .eabi_attribute 25, \val
.endm
.macro function name, export=0 .macro function name, export=0
.set .Lpic_idx, 0 .set .Lpic_idx, 0

7
libavutil/arm/bswap.h
View File

@ -26,13 +26,6 @@
#ifdef __ARMCC_VERSION #ifdef __ARMCC_VERSION
#if HAVE_ARMV6 #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 #define av_bswap32 av_bswap32
static av_always_inline av_const uint32_t av_bswap32(uint32_t x) static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
{ {

2
libavutil/arm/float_dsp_neon.S
View File

@ -22,8 +22,6 @@
#include "config.h" #include "config.h"
#include "asm.S" #include "asm.S"
preserve8
function ff_vector_fmul_neon, export=1 function ff_vector_fmul_neon, export=1
subs r3, r3, #8 subs r3, r3, #8
vld1.32 {d0-d3}, [r1,:128]! vld1.32 {d0-d3}, [r1,:128]!