• 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
dct-test.c 16 KB