Michael Niedermayer d64b854075 Merge commit '666fe5da47' ... * commit '666fe5da47': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-12 21:34:24 +01:00
..
fate	Merge commit 'db2d65ce1e'	2013-03-12 21:15:21 +01:00
ref	Merge commit '3e2f200237'	2013-03-12 15:57:28 +01:00
audiogen.c	Merge commit '511cf612ac'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	Merge commit '9146e872c6'	2013-01-22 14:09:59 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh	Merge remote-tracking branch 'qatar/master'	2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge commit '666fe5da47'	2013-03-12 21:34:24 +01:00
lavfi-regression.sh	tests: add overlay rgb and yuv444 tests	2013-03-05 13:20:13 +01:00
lena.pnm
Makefile	fate: add animated gif decoder tests	2013-02-24 19:27:26 +00:00
md5.sh	Merge commit '3dc06b6972'	2012-10-16 14:04:14 +02:00
regression-funcs.sh
rotozoom.c
test.ffmeta	fate/ffprobe: add some stream metadata.	2012-10-08 11:03:27 +02:00
tiny_psnr.c	Merge commit '3dc06b6972'	2012-10-16 14:04:14 +02:00
utils.c
videogen.c