[FFmpeg-cvslog] Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 11:20:55 2013 +0200| [cb20ca14a330ade01cb73c340976b86933e34c7d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb20ca14a330ade01cb73c340976b86933e34c7d
---