Michael Niedermayer bff2afb3e9 Merge remote-tracking branch 'qatar/master' ... * qatar/master: x86: dsputil: Only compile motion_est code when encoders are enabled mem: fix typo in check for __ICC fate: mp3: drop redundant CMP setting rtp: Depacketization of JPEG (RFC 2435) Rename ff_put_string to avpriv_put_string mjpeg: Rename some symbols to avpriv_* instead of ff_* yadif: cosmetics Conflicts: Changelog libavcodec/mjpegenc.c libavcodec/x86/Makefile libavfilter/vf_yadif.c libavformat/version.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-10 14:06:20 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-09-10 14:06:20 +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