Michael Niedermayer cb20ca14a3 Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a
  lavfi: add a bump and docs entries for the AVOptions switch

Conflicts:
	Changelog
	doc/APIchanges
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 11:20:55 +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