Michael Niedermayer 2a2a643c90 Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
  vf_(no)format: switch to an AVOptions-based system.
  af_aformat: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:59:45 +02:00
..
2012-10-08 11:22:42 +02:00
2013-04-10 12:09:20 +02:00
2013-03-31 22:34:13 +02:00
2013-03-22 09:20:45 +01:00
2013-03-31 18:22:08 -04:00
2013-04-03 21:07:15 +02:00
2013-01-21 10:24:45 +00:00
2013-01-06 16:30:02 +01:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00