Merge commit '04070dbc'

* commit '04070dbc':
  libx265: Fix 'braces around scalar initializer' warning
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/libx265.c

@@ -247,7 +247,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 {
     libx265Context *ctx = avctx->priv_data;
     x265_picture x265pic;
-    x265_picture x265pic_out = { { 0 } };
+    x265_picture x265pic_out = { 0 };
     x265_nal *nal;
     uint8_t *dst;
     int payload = 0;