ffmpeg/tests/filtergraphs
Michael Niedermayer d9d7c54960 Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'
* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
  af_channelmap: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/af_channelmap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:10:12 +02:00
..
channelmap af_channelmap: switch to an AVOptions-based system. 2013-04-09 19:09:40 +02:00
concat
gradfun fate/filter: move gradfun filtergraph to a dedicated script. 2013-03-28 17:44:22 +01:00
overlay fate/filter: make overlay test bitexact. 2013-03-28 17:55:02 +01:00
setpts