OSDN Git Service

Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 21:51:40 +0000 (22:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 21:52:01 +0000 (22:52 +0100)
commit9353ed9e94a544b462be376e61aec9f62d684f56
treee23d30924a9350174b32b91d4e11dc7e18e175d3
parente32b07aea4981719a3e6ce92491349c9547958e1
parent6341ab0ad3fde9583138e121f518e21cde15258e
Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

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

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