From 16c6c926431769d25273b3ec2613e37fae9e8bf2 Mon Sep 17 00:00:00 2001 From: Rintaro Kuroiwa Date: Thu, 13 Feb 2014 20:31:46 -0800 Subject: [PATCH] Fix compilation warning when not using clang Initialier lists caused gcc to raise warnings. Change-Id: Ib9201d537082d311fb5f08e60773bc47ea4af896 --- ..._media_info_dump_muxer_listener_unittest.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/media/event/vod_media_info_dump_muxer_listener_unittest.cc index 981f32c2d5..c9b8bb7b48 100644 --- a/media/event/vod_media_info_dump_muxer_listener_unittest.cc +++ b/media/event/vod_media_info_dump_muxer_listener_unittest.cc @@ -74,11 +74,13 @@ VideoStreamInfoParameters GetDefaultVideoStreamInfoParams() { const std::vector kExtraData; const bool kEncryptedFlag = false; - return {kTrackId, kTimeScale, kVideoStreamDuration, kH264Codec, - VideoStreamInfo::GetCodecString( - kCodecH264, kH264Profile, kH264CompatibleProfile, kH264Level), - kLanuageUndefined, kWidth, kHeight, kNaluLengthSize, kExtraData, - kEncryptedFlag}; + VideoStreamInfoParameters param = { + kTrackId, kTimeScale, kVideoStreamDuration, kH264Codec, + VideoStreamInfo::GetCodecString( + kCodecH264, kH264Profile, kH264CompatibleProfile, kH264Level), + kLanuageUndefined, kWidth, kHeight, kNaluLengthSize, kExtraData, + kEncryptedFlag}; + return param; } OnMediaEndParameters GetDefaultOnMediaEndParams() { @@ -92,8 +94,10 @@ OnMediaEndParameters GetDefaultOnMediaEndParams() { const uint64 kIndexRangeEnd = kIndexRangeStart + 100; const float kMediaDuration = 10.5f; const uint64 kFileSize = 10000; - return {kHasInitRange, kInitRangeStart, kInitRangeEnd, kHasIndexRange, - kIndexRangeStart, kIndexRangeEnd, kMediaDuration, kFileSize}; + OnMediaEndParameters param = { + kHasInitRange, kInitRangeStart, kInitRangeEnd, kHasIndexRange, + kIndexRangeStart, kIndexRangeEnd, kMediaDuration, kFileSize}; + return param; } void SetDefaultMuxerOptionsValues(MuxerOptions* muxer_options) {