[FFmpeg-cvslog] Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 21:46:48 2015 +0200| [1caff5731d9a9f98de9e50569bac0d2d487e9e53] | committer: Michael Niedermayer

Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
  libx265: Fix 'braces around scalar initializer' warning

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

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