FFmpeg/libavcodec
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-07-11 04:04:29 +02:00
2012-07-29 22:02:46 +02:00
2012-07-26 22:22:54 +02:00
2012-07-22 05:23:27 +02:00
2012-07-31 13:21:10 +02:00
2012-07-25 09:26:17 +02:00
2012-07-06 02:19:21 +00:00
2012-07-07 12:33:51 +02:00
2012-07-07 12:34:04 +02:00
2012-07-28 01:18:04 +02:00
2012-07-19 18:44:46 +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-07-10 02:17:53 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-10 02:17:52 +02:00
2012-07-24 05:17:36 +02:00
2012-07-25 21:35:30 +02:00
2012-07-03 13:06:23 +00:00
2012-07-22 05:18:01 +02:00
2012-07-12 23:18:48 +02:00
2012-07-25 21:35:48 +02:00
2012-07-29 16:13:07 +02:00
2012-07-31 17:25:42 +02:00
2012-07-18 16:22:41 +02:00
2012-07-26 17:42:42 +02:00
2012-07-26 17:45:44 +02:00
2012-07-09 15:38:28 +02:00
2012-07-08 17:59:56 +02:00
2012-07-05 02:54:34 +00:00
2012-07-29 22:02:46 +02:00
2012-07-29 22:02:46 +02:00
2012-07-17 17:06:24 +00:00
2012-07-05 04:23:55 +02:00
2012-07-15 14:49:32 +02:00
2012-07-07 22:33:13 +00:00
2012-07-08 23:43:18 +00:00
2012-07-31 17:23:32 +02:00
2012-07-26 22:22:54 +02:00
2012-07-17 01:23:35 +00:00
2012-07-17 01:23:35 +00:00
2012-07-14 13:02:51 +02:00
2012-07-31 13:21:10 +02:00
2012-07-26 10:08:49 +02:00
2012-07-31 13:21:10 +02:00
2012-07-11 23:26:55 +02:00