Michael Niedermayer 7beadfe1f7 Merge remote-tracking branch 'qatar/master' ... * qatar/master: mov_chan: Only set the channel_layout if setting it to a nonzero value mov_chan: Reindent an incorrectly indented line mp2 muxer: mark as AVFMT_NOTIMESTAMPS. x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64 x86: more specific checks for availability of required assembly capabilities x86: avcodec: Drop silly "_mmx" suffix from dsputil template names fate: Drop redundant setting of FUZZ to 1 cavsdsp: set idct permutation independently of dsputil x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-08 12:53:44 +02:00
..
asm.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
bswap.h	Merge remote-tracking branch 'qatar/master'	2012-06-25 16:55:31 +02:00
cpu.c	Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'	2012-08-31 13:01:30 +02:00
cpu.h	Merge remote-tracking branch 'qatar/master'	2012-09-04 17:04:51 +02:00
float_dsp_init.c	Fix compilation with yasm-0.6.2.	2012-09-01 10:59:16 +02:00
float_dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-09-08 12:53:44 +02:00
intmath.h	x86: remove FASTDIV inline asm	2012-08-22 14:29:10 +01:00
intreadwrite.h
Makefile
timer.h	Merge remote-tracking branch 'qatar/master'	2012-07-08 22:33:32 +02:00
w64xmmtest.h	Add more missing includes after removing the implicit common.h	2012-08-16 10:49:54 +03:00
x86inc.asm	Merge remote-tracking branch 'qatar/master'	2012-08-26 22:40:02 +02:00
x86util.asm	Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'	2012-08-24 14:30:40 +02:00