Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:18:48 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:18:48 +0000 (14:18 +0100)
commitd235d240d8ba88b931cb9ca0aca2cfa586c7eea0
treebdf6e17de3f5e40af72b9e1a60a79b3377488a3f
parente7e14bc69a606a6bec82efef729263cd38f122d4
parentded3673d77943c376d94e8157b1238bbd1eeca2d
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@gmx.at>
doc/encoders.texi
libavcodec/libx264.c