ffmpeg/tests
Michael Niedermayer a201639a01 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavutil/pixfmt.h
	libswscale/swscale_unscaled.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 17:47:36 +01:00
..
fate Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 2012-10-30 14:40:22 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-10-30 17:47:36 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-10-23 15:12:20 +02:00
asynth1.sw
audiogen.c
base64.c
copycooker.sh
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 lavfi/scale: accept named options, make parsing more robust 2012-10-29 17:39:26 +01:00
lena.pnm
md5.sh Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 2012-10-16 14:04:14 +02:00
utils.c
videogen.c