Michael Niedermayer d8cfa98358 Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56' ... * commit '58b619c8a226cc4564ad5af291bc99a04f89ee56': wav muxer: write metadata Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-17 15:16:23 +02:00
..
fate	Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'	2012-10-17 14:17:55 +02:00
ref	Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'	2012-10-17 15:16:23 +02:00
asynth1.sw
audiogen.c
base64.c
copycooker.sh
fate-run.sh
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	fate: add faststart regression test.	2012-09-27 08:59:37 +02:00
lavfi-regression.sh	fate: add vf_idet filter to lavfi regression tests	2012-10-11 02:21:28 +02:00
lena.pnm
Makefile	Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'	2012-10-10 13:01:27 +02:00
md5.sh	Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'	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 '3dc06b6972cf389269e9c36ff0a4373f80f7149b'	2012-10-16 14:04:14 +02:00
utils.c
videogen.c