Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'
* commit '6341ab0ad3fde9583138e121f518e21cde15258e': libx265: Pass through user-set frame type See: 41e983f1a63927dc0a2596cf2f0f7a946a048f11 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9353ed9e94