diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 21:46:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 21:46:52 +0200 |
| commit | 1caff5731d9a9f98de9e50569bac0d2d487e9e53 (patch) | |
| tree | 2538231d616d8b051a362dcfeea2d835e84b3eb8 /libavcodec | |
| parent | 20ce69e5f85dd29cc850a98060972821d69bfd3a (diff) | |
| parent | 04070dbca0688ab1e24528ce5c135254a9a79c47 (diff) | |
| download | ffmpeg-1caff5731d9a9f98de9e50569bac0d2d487e9e53.tar.gz | |
Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'
* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
libx265: Fix 'braces around scalar initializer' warning
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx265.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 8924657cc2..983b430bc1 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; |