[FFmpeg-cvslog] Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 12 21:28:45 2014 +0200| [451469fd1aa141b15baea06a66e2404721de1e0b] | committer: Michael Niedermayer

Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

* commit '61a344916d324c8ca52064964478f46c877f02e2':
  libx265: Add 4:2:2 support

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

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