aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-05-01 15:39:26 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-05-06 14:53:29 +0100
commit04070dbca0688ab1e24528ce5c135254a9a79c47 (patch)
tree912f5dc61b065aa535aedf7040f1112ad94ce8c1 /libavcodec
parentd81fb63d87692765c004c19934b49427df434a07 (diff)
downloadffmpeg-04070dbca0688ab1e24528ce5c135254a9a79c47.tar.gz
libx265: Fix 'braces around scalar initializer' warning
x265 Reordered the x265_picture fields in the commit https://github.com/videolan/x265/commit/51b1518de2414431f36eac592db15b667c25a7b9#diff-945b5354d8767dfac13334f2d22cf58fR107 Now the first field is an integer and not an array.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libx265.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 2fe7889465..36cd0a858c 100644
--- a/libavcodec/libx265.c
+++ b/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;