From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 11 Nov 2016 20:29:25 +0000 (+0100)
Subject: [ffmpeg_consumer] Fixed compilation problem in Linux.
X-Git-Tag: 2.1.0_Beta1~7
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1ec1ef8a32bf7e042468d2776271f636bbb70aa1;hp=b17a5351a13075978b5e5d4c817fb683224d9d38;p=casparcg

[ffmpeg_consumer] Fixed compilation problem in Linux.
---

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 0b3870125..e6f1ded38 100644
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -746,7 +746,7 @@ private:
 				audio_output_pad(
 						from_terminated_array<int>(				codec.supported_samplerates,	0),
 						from_terminated_array<AVSampleFormat>(	codec.sample_fmts,				AVSampleFormat::AV_SAMPLE_FMT_NONE),
-						from_terminated_array<uint64_t>(		codec.channel_layouts,			0ull)));
+						from_terminated_array<uint64_t>(		codec.channel_layouts,			static_cast<uint64_t>(0))));
 
 		audio_filter_.reset(new audio_filter(
 				{ audio_input_pad(