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
..
fate	Merge remote-tracking branch 'qatar/master'	2012-09-08 12:53:44 +02:00
ref	flashsv2enc: only encode diff blocks when needed	2012-09-08 05:36:34 +02:00
asynth1.sw
audiogen.c
base64.c
copycooker.sh
fate_config.sh.template
fate-run.sh
fate-update.sh
fate-valgrind.supp
fate.sh	Merge remote-tracking branch 'qatar/master'	2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lavfi-regression.sh	tests/lavfi-regression: name temporary files after $testname in do_lavfi_pixfmts()	2012-09-06 01:09:36 +02:00
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-08-23 14:33:33 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
tiny_psnr.c
utils.c
videogen.c