Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:46:48 +0000 (21:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:46:52 +0000 (21:46 +0200)
commit1caff5731d9a9f98de9e50569bac0d2d487e9e53
tree2538231d616d8b051a362dcfeea2d835e84b3eb8
parent20ce69e5f85dd29cc850a98060972821d69bfd3a
parent04070dbca0688ab1e24528ce5c135254a9a79c47
Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

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

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