Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:26:04 +0000 (15:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:26:04 +0000 (15:26 +0200)
commit560e9365b6eb6ce34eddea1a582047e09022fcb0
treef5c100558cf72518d6b6939aeff8d371d52468e7
parent5dd8ca7d1b5401d5bfe078f4129db199fe317ad5
parentbc54c2ae3ca6abd225dc331eafc12108513158de
Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'

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

Conflicts:
doc/encoders.texi

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