Michael Niedermayer cb20ca14a3 Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d' ...

* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
  x86inc: Fix number of operands for cmp* instructions
  af_channelmap: fix uninitialized variable use introduced in ba8efac977
  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

60 KiB

Raw Blame History

View Raw