* commit 'ded3673d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
	doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>