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
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 10:29:10 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-29 22:02:46 +02:00
2012-08-01 20:17:25 +00:00
2012-07-26 22:22:54 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 13:21:10 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-07-28 01:18:04 +02:00
2012-07-28 03:28:46 +02:00
2012-07-28 03:28:46 +02:00
2012-07-28 03:28:46 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-07-27 12:27:21 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-08-01 04:19:27 +02:00
2012-07-26 16:33:17 +02:00
2012-07-26 16:33:39 +02:00
2012-08-01 04:19:46 +02:00
2012-07-30 23:28:31 +02:00
2012-07-31 22:41:00 +02:00
2012-07-25 22:00:06 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-30 20:46:55 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 22:41:00 +02:00
2012-07-29 16:13:07 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 17:25:42 +02:00
2012-08-01 23:33:06 +02:00
2012-07-31 17:22:23 +02:00
2012-07-31 17:23:31 +02:00
2012-07-26 17:42:42 +02:00
2012-07-26 17:45:44 +02:00
2012-07-31 01:57:18 +02:00
2012-07-27 13:41:58 +02:00
2012-07-28 05:31:27 +02:00
2012-07-30 23:28:31 +02:00
2012-07-30 23:28:31 +02:00
2012-08-01 19:35:58 +02:00
2012-07-30 03:48:46 +02:00
2012-08-01 03:16:55 +00:00
2012-07-29 22:02:46 +02:00
2012-07-29 22:02:46 +02:00
2012-07-26 22:22:49 +02:00
2012-07-31 17:23:32 +02:00
2012-07-26 22:22:54 +02:00
2012-07-27 23:42:19 +02:00
2012-07-31 22:41:00 +02:00
2012-07-31 13:21:10 +02:00
2012-07-26 10:08:49 +02:00
2012-07-31 03:00:35 +02:00
2012-07-31 03:00:35 +02:00
2012-07-31 17:17:38 +02:00
2012-07-31 13:21:10 +02:00
2012-07-26 21:37:15 +02:00
2012-07-27 12:43:15 +02:00
ec7ecb8811