Michael Niedermayer 43bac121d3 Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
  vf_blackframe: switch to an AVOptions-based system.
  vf_aspect: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c

In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 15:37:21 +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
2012-01-28 11:04:19 +01: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