Merge commit '6341ab0ad3fde9583138e121f518e21cde15258e'

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

See: 41e983f1a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-22 22:51:40 +01:00
commit 9353ed9e94

Diff Content Not Available