Michael Niedermayer 1e5656bf8a Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f' ...

* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

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

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

..

fate

Merge remote-tracking branch 'qatar/master'

2014-02-06 00:35:05 +01:00

filtergraphs

lavfi/overlay: add yuv422 format mode

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

ref

Merge remote-tracking branch 'qatar/master'

2014-02-06 00:35:05 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02:00

base64.c

…

copycooker.sh

…

fate-run.sh

avformat/framehash: add software version to framecrc/md5

2013-10-23 16:32:32 +02:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

tests/fate: fix fate on branches different from origin/master

2013-10-29 21:53:59 +01:00

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

Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

2013-10-16 12:07:02 +02:00

tiny_ssim.c

…

utils.c

…

videogen.c

…