Michael Niedermayer 267c5723e0 Merge remote-tracking branch 'qatar/master' ... * qatar/master: FATE: add a test for the ONE_STR mapping mode of the channelmap filter Conflicts: tests/fate/filter-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-16 14:32:47 +01:00
..
alphamerge_alphaextract_rgb
alphamerge_alphaextract_yuv
channelmap_one_int	FATE: add a test for the ONE_STR mapping mode of the channelmap filter	2014-03-16 07:44:03 +01:00
channelmap_one_str	FATE: add a test for the ONE_STR mapping mode of the channelmap filter	2014-03-16 07:44:03 +01:00
concat
gradfun
hqdn3d
lavr_mix_output_zero
overlay
overlay_rgb
overlay_yuv420
overlay_yuv422
overlay_yuv444
scalenorm
select-alternate
setpts