Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Issue 214 #215

Merged
merged 2 commits into from
Mar 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ Chun-da Chen <capitalm.c@gmail.com>
Google Inc. <*@google.com>
Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Philo Inc. <*@philo.com>
Richard Eklycke <richard@eklycke.se>
Sergio Ammirata <sergio@ammirata.net>
The Chromium Authors <*@chromium.org>
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Jacob Trimble <modmaker@google.com>
Joey Parrish <joeyparrish@google.com>
Kongqun Yang <kqyang@google.com>
Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Richard Eklycke <richard@eklycke.se>
Rintaro Kuroiwa <rkuroiwa@google.com>
Sergio Ammirata <sergio@ammirata.net>
Thomas Inskip <tinskip@google.com>
2 changes: 1 addition & 1 deletion packager/media/base/stream_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class StreamInfo {
return encryption_config_;
}

void set_duration(int duration) { duration_ = duration; }
void set_duration(uint64_t duration) { duration_ = duration; }
void set_codec(Codec codec) { codec_ = codec; }
void set_codec_config(const std::vector<uint8_t>& data) { codec_config_ = data; }
void set_codec_string(const std::string& codec_string) {
Expand Down