diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-15 04:40:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-15 04:44:07 +0200 |
| commit | 5a153604c930792aa7f00c55cbf3c470f582dfb7 (patch) | |
| tree | 607cdb67b5669c6f317d86f16ff8f3ea7ed6e7ae /libavcodec/arm | |
| parent | 2c4ad1a37b7980b40d6875daea4f87b154509c2e (diff) | |
| parent | 888fa31ecafa75cef3c154e129c45060eea88bd7 (diff) | |
| download | ffmpeg-5a153604c930792aa7f00c55cbf3c470f582dfb7.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Fix FSF address copy paste error in some license headers.
Add an aac sample which uses LTP to fate-aac.
DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
arm: properly mark external symbol call
Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libswscale/ppc/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/ac3dsp_armv6.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S index c6ce47a2f7..2b2f2acf22 100644 --- a/libavcodec/arm/ac3dsp_armv6.S +++ b/libavcodec/arm/ac3dsp_armv6.S @@ -79,5 +79,5 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 ldr r0, [sp, #12] mov r1, #0 mov r2, #256 - b memset + b X(memset) endfunc diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index d981db814e..aee9c52608 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -180,7 +180,7 @@ function ff_decode_block_coeffs_armv6, export=1 rac_get_prob r5, r6, r7, r8, r0, r9, r10 mov r9, #8 addge r12, r12, #1 - movrel r4, ff_vp8_dct_cat_prob + movrel r4, X(ff_vp8_dct_cat_prob) lsl r9, r9, r12 ldr r4, [r4, r12, lsl #2] add r12, r9, #3 |