[FFmpeg-cvslog] Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 12:10:01 2014 +0200| [eacf42dd50885936ae05dd7fd415c4544b9f41cf] | committer: Michael Niedermayer

Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'

* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

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

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