Michael Niedermayer 8ac0d95bd3 Merge remote-tracking branch 'qatar/master' ... * qatar/master: h264: avoid pointless copying of ref lists lavr: always reset mix function names and pointers in mix_function_init() lavr: call mix_function_init() in ff_audio_mix_set_matrix() fate: update ref after rv30_loop_filter fix rv30: fix masking in rv30_loop_filter() Conflicts: tests/ref/fate/filter-delogo tests/ref/fate/rv30 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-01-18 13:54:38 +01:00
..
fate	Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'	2013-01-16 12:07:27 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2013-01-18 13:54:38 +01:00
audiogen.c	Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'	2012-12-21 17:32:52 +01:00
base64.c	Merge remote-tracking branch 'qatar/master'	2012-01-19 01:19:38 +01:00
copycooker.sh
fate-run.sh	fate: disable globbing when calling shell functions.	2013-01-03 16:16:07 +01:00
fate-update.sh
fate-valgrind.supp	Add a --valgrind configure option.	2012-01-21 12:04:46 +01:00
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	Sony Wave64 muxer	2012-12-31 07:10:57 +00:00
lavfi-regression.sh	lavfi: add histeq filter	2013-01-05 10:25:32 +01:00
lena.pnm
Makefile	fate: add sub2video test.	2013-01-02 17:53:12 +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 '3dc06b6972cf389269e9c36ff0a4373f80f7149b'	2012-10-16 14:04:14 +02:00
utils.c	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
videogen.c	Merge remote-tracking branch 'qatar/master'	2012-06-07 21:45:52 +02:00