Michael Niedermayer 3773738e26 Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c' ... * commit 'ca96e337169093979d7c763064ad9dae12b3108c': vp9: drop support for real (non-emulated) edges Conflicts: libavcodec/vp9block.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-01-09 14:41:23 +01:00
..
fate	Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'	2014-01-09 14:41:23 +01:00
filtergraphs	Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'	2014-01-04 02:47:34 +01:00
ref	Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'	2014-01-06 13:24:48 +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	fate: fix dpx on big endian	2013-10-06 15:22:18 +02:00
lena.pnm
Makefile	Merge commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091'	2014-01-04 02:35:11 +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