[FFmpeg-cvslog] Merge commit '31048d48b0410b9cfb6023054d81e627d01be342'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 22:33:57 2015 +0200| [db4ac46fed9b12e3597903c5e99cce146bb05c7e] | committer: Michael Niedermayer

Merge commit '31048d48b0410b9cfb6023054d81e627d01be342'

* commit '31048d48b0410b9cfb6023054d81e627d01be342':
  avcodec/libx265: export chosen picture types

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

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