1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavfilter
Michael Niedermayer 42c70b3584 Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
  af_join: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:37:43 +02:00
..
2013-04-10 00:08:57 +00:00
2013-03-17 12:31:25 +01:00
2013-03-10 13:56:17 +01:00
2013-01-05 05:21:44 +01:00
2013-04-10 00:08:57 +00:00
2013-03-10 02:13:02 +01:00