[FFmpeg-cvslog] Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 15:26:04 2013 +0200| [560e9365b6eb6ce34eddea1a582047e09022fcb0] | committer: Michael Niedermayer

Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'

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

Conflicts:
	doc/encoders.texi

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

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