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)
* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
  libx265: Fix 'braces around scalar initializer' warning

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

Simple merge