* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de': libx264: add shortcut for the bluray compatibility option Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
30 KiB
30 KiB