Michael Niedermayer e03c1af55e Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-segmentation-aq-akiyo
	tests/ref/fate/vp9-segmentation-sf-akiyo

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

2014-02-13 00:41:40 +01:00

..

fate

Merge remote-tracking branch 'qatar/master'

2014-02-13 00:41:40 +01:00

filtergraphs

lavfi/overlay: add yuv422 format mode

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

ref

vp9: add a new segmentation sample.

2014-02-12 15:18:21 +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

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +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

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'

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

tiny_ssim.c

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01:00

utils.c

…

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00