[FFmpeg-cvslog] Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 21:36:02 2014 +0100| [92225877cee1b6327da3b28b624a35e1ca4d112f] | committer: Michael Niedermayer

Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'

* commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34':
  libx265: Remove redundant default param call

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

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