Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Feb 2015 19:35:06 +0000 (20:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Feb 2015 19:45:18 +0000 (20:45 +0100)
commit77c133f7ac526a32fc99d4abc8313984fcfd1a82
tree2a186e38d25dca149f0f268aac76d725416c7639
parent00acf38379d333d3d20de7b70390eeae0f323512
parentd617e77cecc5b363ef1860955b548f4ac007add6
Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'

* commit 'd617e77cecc5b363ef1860955b548f4ac007add6':
  libx265: Add crf private option

See: 8b96e8dd28c83448c9b4af81b834deb9b525be80
Merged-by: Michael Niedermayer <michaelni@gmx.at>