Merge commit '31048d48b0410b9cfb6023054d81e627d01be342'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:33:57 +0000 (22:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:34:17 +0000 (22:34 +0200)
* commit '31048d48b0410b9cfb6023054d81e627d01be342':
  avcodec/libx265: export chosen picture types

See: 2ddedfd39c0d6b49e6396c535d5cb21846676a13
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge