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 errors by clang for mpd_builder target 

Change-Id: I7c6f09714a4005267469bebf4b9783466883236f
This commit is contained in:
Rintaro Kuroiwa 2014-01-16 00:12:14 -08:00
parent efa270963e
commit 72deea3493
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mpd/base/content_protection_element.cc Normal file
View File

@ -0,0 +1,6 @@
#include "mpd/base/content_protection_element.h"
namespace dash_packager {
ContentProtectionElement::ContentProtectionElement() {}
ContentProtectionElement::~ContentProtectionElement() {}
} // namespace dash_packager

3
mpd/base/content_protection_element.h
View File

@ -12,6 +12,9 @@
namespace dash_packager { namespace dash_packager {
struct ContentProtectionElement { struct ContentProtectionElement {
ContentProtectionElement();
~ContentProtectionElement();
std::string value; // Will be set for 'value' attribute. std::string value; // Will be set for 'value' attribute.
std::string scheme_id_uri; // Will be set for 'schemeIdUri' attribute. std::string scheme_id_uri; // Will be set for 'schemeIdUri' attribute.

2
mpd/base/mpd_builder.cc
View File

@ -290,7 +290,7 @@ bool Representation::Init() {
return false; return false;
} }
if (!media_info_.container_type() == MediaInfo::CONTAINER_UNKNOWN) { if (media_info_.container_type() == MediaInfo::CONTAINER_UNKNOWN) {
// TODO(rkuroiwa): This might not be the right behavior. Maybe somehow // TODO(rkuroiwa): This might not be the right behavior. Maybe somehow
// infer from something else like media file name? // infer from something else like media file name?
LOG(ERROR) << "'container_type' in MediaInfo cannot be CONTAINER_UNKNOWN."; LOG(ERROR) << "'container_type' in MediaInfo cannot be CONTAINER_UNKNOWN.";

1
mpd/mpd.gyp
View File

@ -30,6 +30,7 @@
'target_name': 'mpd_builder', 'target_name': 'mpd_builder',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
'base/content_protection_element.cc',
'base/content_protection_element.h', 'base/content_protection_element.h',
'base/mpd_builder.cc', 'base/mpd_builder.cc',
'base/mpd_builder.h', 'base/mpd_builder.h',