• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ec7ecb88
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ec7ecb88
Name
Last commit
Last update
..
Makefile Loading commit data...
aac.h Loading commit data...
aacpsdsp_init_arm.c Loading commit data...
aacpsdsp_neon.S Loading commit data...
ac3dsp_arm.S Loading commit data...
ac3dsp_armv6.S Loading commit data...
ac3dsp_init_arm.c Loading commit data...
ac3dsp_neon.S Loading commit data...
asm-offsets.h Loading commit data...
dca.h Loading commit data...
dcadsp_init_arm.c Loading commit data...
dcadsp_neon.S Loading commit data...
dsputil_arm.S Loading commit data...
dsputil_arm.h Loading commit data...
dsputil_armv6.S Loading commit data...
dsputil_init_arm.c Loading commit data...
dsputil_init_armv5te.c Loading commit data...
dsputil_init_armv6.c Loading commit data...
dsputil_init_neon.c Loading commit data...
dsputil_init_vfp.c Loading commit data...
dsputil_neon.S Loading commit data...
dsputil_vfp.S Loading commit data...
fft_fixed_init_arm.c Loading commit data...
fft_fixed_neon.S Loading commit data...
fft_init_arm.c Loading commit data...
fft_neon.S Loading commit data...
fmtconvert_init_arm.c Loading commit data...
fmtconvert_neon.S Loading commit data...
fmtconvert_vfp.S Loading commit data...
h264cmc_neon.S Loading commit data...
h264dsp_init_arm.c Loading commit data...
h264dsp_neon.S Loading commit data...
h264idct_neon.S Loading commit data...
h264pred_init_arm.c Loading commit data...
h264pred_neon.S Loading commit data...
int_neon.S Loading commit data...
jrevdct_arm.S Loading commit data...
mathops.h Loading commit data...
mdct_fixed_neon.S Loading commit data...
mdct_neon.S Loading commit data...
mpegaudiodsp_fixed_armv6.S Loading commit data...
mpegaudiodsp_init_arm.c Loading commit data...
mpegvideo_arm.c Loading commit data...
mpegvideo_arm.h Loading commit data...
mpegvideo_armv5te.c Loading commit data...
mpegvideo_armv5te_s.S Loading commit data...
mpegvideo_neon.S Loading commit data...
neon.S Loading commit data...
rdft_neon.S Loading commit data...
rv34dsp_init_neon.c Loading commit data...
rv34dsp_neon.S Loading commit data...
rv40dsp_init_neon.c Loading commit data...
rv40dsp_neon.S Loading commit data...
sbrdsp_init_arm.c Loading commit data...
sbrdsp_neon.S Loading commit data...
simple_idct_arm.S Loading commit data...
simple_idct_armv5te.S Loading commit data...
simple_idct_armv6.S Loading commit data...
simple_idct_neon.S Loading commit data...
synth_filter_neon.S Loading commit data...
vp3dsp_init_arm.c Loading commit data...
vp3dsp_neon.S Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp_init_arm.c Loading commit data...
vp56dsp_neon.S Loading commit data...
vp8.h Loading commit data...
vp8_armv6.S Loading commit data...
vp8dsp.h Loading commit data...
vp8dsp_armv6.S Loading commit data...
vp8dsp_init_arm.c Loading commit data...
vp8dsp_init_armv6.c Loading commit data...
vp8dsp_init_neon.c Loading commit data...
vp8dsp_neon.S Loading commit data...