Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:02:06 +0000 (21:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:02:36 +0000 (21:02 +0100)
* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
  libx265: Support 4:4:4

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

Trivial merge