ffmpeg/libavformat
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-29 01:28:12 +00:00
2012-08-01 13:33:51 +02:00
2011-11-05 16:51:25 +01:00
2011-12-19 11:57:34 +01:00
2012-06-09 10:57:14 +00:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-08-09 19:56:25 +02:00
2012-07-30 02:45:21 +00:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-10 13:27:16 +02:00
2012-07-03 09:53:42 +00:00
2012-05-21 08:51:50 +02:00
2012-07-29 01:28:12 +00:00
2012-07-20 11:19:01 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-08-01 08:33:18 +02:00
2012-06-11 07:35:14 +02:00
2012-07-05 04:23:55 +02:00
2012-07-20 11:16:52 +02:00
2012-07-20 11:16:52 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-07-08 20:49:04 +00:00
2012-07-29 08:06:30 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-02-23 16:00:22 +01:00
2012-07-25 20:31:16 +03:00
2012-07-08 20:49:35 +00:00
2012-07-26 22:22:54 +02:00
2012-05-18 23:34:11 +02:00
2012-06-25 16:20:08 +03:00
2012-07-06 17:08:22 +02:00
2012-07-29 01:28:12 +00:00
2012-07-06 17:08:22 +02:00
2012-08-01 03:15:32 +00:00