[FFmpeg-cvslog] Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 26 14:18:48 2013 +0100| [d235d240d8ba88b931cb9ca0aca2cfa586c7eea0] | committer: Michael Niedermayer

Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

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

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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