aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-01 23:33:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-01 23:33:06 +0200
commitec7ecb88117fd2d086f0be45ded9743c94100ef4 (patch)
tree8536e70dd413e0dc1c5cd65dec3c37928ef3b8cc /configure
parent4c8fc6a2a41d1b8a4d3eb4452bb5d728253273f4 (diff)
parent19cf7163c1576e7b03ea33d7bf633e14d7516db8 (diff)
downloadffmpeg-ec7ecb88117fd2d086f0be45ded9743c94100ef4.tar.gz
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>
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions