* commit 'bc54c2ae':
  libx264: add shortcut for the bluray compatibility option

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