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)
* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

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

Simple merge