ffmpeg/tests
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 Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
base64.c
copycooker.sh
fate_config.sh.template
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
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 vocenc: change default codec to 16bit 2012-06-25 03:35:09 +02:00
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 fate: try to fix 3rd md5 implementation 2012-06-01 04:16:23 +02:00
regression-funcs.sh fate: remove unused functions 2012-05-30 05:57:56 +02:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2012-06-07 21:45:52 +02:00
tiny_psnr.c tiny_psnr: fix undefined shift 2012-08-01 20:00:01 +02:00
utils.c Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-06-07 21:45:52 +02:00