Merge commit '61a344916d324c8ca52064964478f46c877f02e2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 19:28:45 +0000 (21:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 19:28:58 +0000 (21:28 +0200)
* commit '61a344916d324c8ca52064964478f46c877f02e2':
  libx265: Add 4:2:2 support

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

Trivial merge