[FFmpeg-cvslog] Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 21:02:06 2014 +0100| [3d53bbd0ac06af0831fe1f07cca51e53d58f51ea] | committer: Michael Niedermayer

Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'

* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
  libx265: Support 4:4:4

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d53bbd0ac06af0831fe1f07cca51e53d58f51ea
---