[FFmpeg-cvslog] Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 11 17:59:39 2015 +0200| [816bbc1cf532eeacfebbe3b65e10adb3e620ac45] | committer: Michael Niedermayer

Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'

* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
  libx265: print supported presets and tunes on error

See: 61090db29a3e8364431d46c16770425815f7608a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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