1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer ec7ecb8811 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
  ARM: use =const syntax instead of explicit literal pools
  ARM: use standard syntax for all LDRD/STRD instructions
  fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
  dct-test: allow to compile without HAVE_INLINE_ASM.
  x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
  dca: Move tables used outside of dcadec.c to a separate file.
  dca: Rename dca.c ---> dcadec.c
  x86: h264dsp: Remove unused variable ff_pb_3_1
  apetag: change a forgotten return to return 0

Conflicts:
	libavcodec/Makefile
	libavcodec/dca.c
	libavcodec/x86/fft_3dn.c
	libavcodec/x86/fft_3dn2.c
	libavcodec/x86/fft_mmx.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01 23:33:06 +02:00
..
aac.h
aacpsdsp_init_arm.c aacps: NEON optimisations 2012-05-05 22:04:21 +01:00
aacpsdsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_armv6.S ARM: generate position independent code to access data symbols 2012-07-01 11:25:06 +01:00
ac3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
ac3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
asm-offsets.h
dca.h
dcadsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
dcadsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_arm.h
dsputil_arm.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_init_arm.c lowres2 support. 2012-04-22 22:26:55 +02:00
dsputil_init_armv5te.c lowres2 support. 2012-04-22 22:26:55 +02:00
dsputil_init_armv6.c lowres2 support. 2012-04-22 22:26:55 +02:00
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
dsputil_init_vfp.c Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
dsputil_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fft_fixed_init_arm.c Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
fft_fixed_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
fft_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
fft_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
fmtconvert_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264cmc_neon.S ARM: use standard syntax for all LDRD/STRD instructions 2012-08-01 10:32:24 +01:00
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
h264idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264pred_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
h264pred_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
int_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
jrevdct_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
Makefile vp3: move idct and loop filter pointers to new vp3dsp context 2012-07-18 10:32:19 +01:00
mathops.h
mdct_fixed_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
mpegaudiodsp_fixed_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
mpegaudiodsp_init_arm.c ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
mpegvideo_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
mpegvideo_arm.h
mpegvideo_armv5te_s.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
mpegvideo_armv5te.c
mpegvideo_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
neon.S
rdft_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
rv34dsp_init_neon.c
rv34dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
rv40dsp_init_neon.c rv40dsp: implement prescaled versions for biweight. 2012-04-10 10:06:48 -07:00
rv40dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
sbrdsp_init_arm.c ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
sbrdsp_neon.S ARM: generate position independent code to access data symbols 2012-07-01 11:25:06 +01:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_armv5te.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_armv6.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
simple_idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
synth_filter_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
vp3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
vp8_armv6.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
vp8.h
vp8dsp_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
vp8dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-26 22:24:58 +02:00
vp8dsp_init_armv6.c vp8: armv6 optimisations 2012-04-25 21:41:39 +01:00
vp8dsp_init_neon.c vp8: arm: separate ARMv6 functions from NEON 2012-04-25 21:41:39 +01:00
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp8dsp.h vp8: arm: separate ARMv6 functions from NEON 2012-04-25 21:41:39 +01:00
vp56_arith.h
vp56dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
vp56dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00