Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:10:01 +0000 (12:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:10:09 +0000 (12:10 +0200)
commiteacf42dd50885936ae05dd7fd415c4544b9f41cf
tree2e7981e2b13e4635d1eef87b8b9f1ebc8e2ade42
parent928cb84b32b639841ac1ec2957155a6abd53309f
parent4912b634b517c8acfc476c5d47f10be83fe7e18b
Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx265.c