Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation warning when not using clang 

Initialier lists caused gcc to raise warnings.

Change-Id: Ib9201d537082d311fb5f08e60773bc47ea4af896
This commit is contained in:
Rintaro Kuroiwa 2014-02-13 20:31:46 -08:00
parent 172cd59987
commit 16c6c92643
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
media/event/vod_media_info_dump_muxer_listener_unittest.cc
View File

@ -74,11 +74,13 @@ VideoStreamInfoParameters GetDefaultVideoStreamInfoParams() {
const std::vector<uint8> kExtraData; const std::vector<uint8> kExtraData;
const bool kEncryptedFlag = false; const bool kEncryptedFlag = false;
return {kTrackId, kTimeScale, kVideoStreamDuration, kH264Codec, VideoStreamInfoParameters param = {
VideoStreamInfo::GetCodecString( kTrackId, kTimeScale, kVideoStreamDuration, kH264Codec,
kCodecH264, kH264Profile, kH264CompatibleProfile, kH264Level), VideoStreamInfo::GetCodecString(
kLanuageUndefined, kWidth, kHeight, kNaluLengthSize, kExtraData, kCodecH264, kH264Profile, kH264CompatibleProfile, kH264Level),
kEncryptedFlag}; kLanuageUndefined, kWidth, kHeight, kNaluLengthSize, kExtraData,
kEncryptedFlag};
return param;
} }
OnMediaEndParameters GetDefaultOnMediaEndParams() { OnMediaEndParameters GetDefaultOnMediaEndParams() {
@ -92,8 +94,10 @@ OnMediaEndParameters GetDefaultOnMediaEndParams() {
const uint64 kIndexRangeEnd = kIndexRangeStart + 100; const uint64 kIndexRangeEnd = kIndexRangeStart + 100;
const float kMediaDuration = 10.5f; const float kMediaDuration = 10.5f;
const uint64 kFileSize = 10000; const uint64 kFileSize = 10000;
return {kHasInitRange, kInitRangeStart, kInitRangeEnd, kHasIndexRange, OnMediaEndParameters param = {
kIndexRangeStart, kIndexRangeEnd, kMediaDuration, kFileSize}; kHasInitRange, kInitRangeStart, kInitRangeEnd, kHasIndexRange,
kIndexRangeStart, kIndexRangeEnd, kMediaDuration, kFileSize};
return param;
} }
void SetDefaultMuxerOptionsValues(MuxerOptions* muxer_options) { void SetDefaultMuxerOptionsValues(MuxerOptions* muxer_options) {