[FFmpeg-cvslog] Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 22 22:51:40 2015 +0100| [9353ed9e94a544b462be376e61aec9f62d684f56] | committer: Michael Niedermayer

Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

* commit '6341ab0ad3fde9583138e121f518e21cde15258e':
  libx265: Pass through user-set frame type

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

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