ffmpeg/tests
Michael Niedermayer b5da7d4c1a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option

Conflicts:
	configure
	libavcodec/eamad.c
	libavcodec/h264_ps.c
	libavformat/crcenc.c
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	libavformat/framecrcenc.c
	libavformat/md5enc.c
	libavformat/nutdec.c
	libavformat/rawenc.c
	libavformat/yuv4mpeg.c
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30 23:28:31 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
ref fate: fix forgotten hunk for framerate order change in ffmpeg.c 2012-07-30 17:51:33 +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 mem: heap memory poisoning. 2012-07-02 21:02:15 +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 lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
lena.pnm
Makefile fate: switch rsync to fate-suite.ffmpeg.org 2012-07-28 17:05:24 +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 Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +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