Michael Niedermayer 8334850a99 Merge commit '93afb6c98d' ... * commit '93afb6c98d': avconv: set output avg_frame_rate when known Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-18 14:38:36 +02:00
..
fate	Merge commit '4735784f1c'	2014-05-16 21:22:25 +02:00
filtergraphs	Merge remote-tracking branch 'qatar/master'	2014-03-16 14:32:47 +01:00
ref	Merge commit '93afb6c98d'	2014-05-18 14:38:36 +02:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh	Merge commit '0c1959b056'	2014-05-15 19:16:57 +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 '60fd7d36c4'	2014-04-09 13:58:55 +02:00
lena.pnm
Makefile	Merge commit 'b70d7a4ac7'	2014-05-15 18:20:17 +02:00
md5.sh
regression-funcs.sh	Merge commit '0c1959b056'	2014-05-15 19:16:57 +02:00
rotozoom.c
test.ffmeta
tiny_psnr.c	tests/tiny_psnr: Print information about the supported sample types in the help and error texts	2014-03-24 04:02:51 +01:00
tiny_ssim.c	tests/tiny_ssim: more correct error message	2014-05-05 19:00:14 +02:00
utils.c
videogen.c