Michael Niedermayer 7011aab501 Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f' ...

* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f':
  FATE: add tests for the shuffleplanes filter

Conflicts:
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-06 13:09:06 +01:00

..

fate

Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

2014-03-06 13:09:06 +01:00

filtergraphs

lavfi/overlay: add yuv422 format mode

2014-02-02 11:50:21 +01:00

ref

Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

2014-03-06 13:09:06 +01:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

…

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

2014-02-10 12:39:55 +01:00

lena.pnm

…

Makefile

Merge remote-tracking branch 'qatar/master'

2014-01-31 15:26:53 +01:00

md5.sh

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

tiny_ssim.c

tests/tiny_ssim: drop isatty() support

2014-02-21 17:29:58 +01:00

utils.c

…

videogen.c

…