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: apply cmake fixes after merge of #1210 (#1264) 

build in CMake branch is broken at least locally on OS X after #1210 was
merged which introduced some new warnings and reintroduced
base::nullopt.
This commit is contained in:
Cosmin Stejerean 2023-09-19 09:03:32 +01:00 committed by GitHub
parent 5557e76c2b
commit 8b87804c57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/mpd/base/adaptation_set.cc
View File

@ -296,7 +296,7 @@ std::optional<xml::XmlNode> AdaptationSet::GetXml() {
!adaptation_set.AddSupplementalProperty( !adaptation_set.AddSupplementalProperty(
"urn:mpeg:mpegB:cicp:TransferCharacteristics", "urn:mpeg:mpegB:cicp:TransferCharacteristics",
std::to_string(transfer_characteristics_))) { std::to_string(transfer_characteristics_))) {
return base::nullopt; return std::nullopt;
} }
// Note: must be checked before checking segments_aligned_ (below). So that // Note: must be checked before checking segments_aligned_ (below). So that

2
packager/mpd/base/adaptation_set.h
View File

@ -181,7 +181,7 @@ class AdaptationSet {
void set_codec(const std::string& codec) { codec_ = codec; }; void set_codec(const std::string& codec) { codec_ = codec; };
/// @return transfer_characteristics. /// @return transfer_characteristics.
const uint32_t transfer_characteristics() const { uint32_t transfer_characteristics() const {
return transfer_characteristics_; return transfer_characteristics_;
} }

1
packager/mpd/base/mpd_utils.h
View File

@ -11,6 +11,7 @@
#include <libxml/tree.h> #include <libxml/tree.h>
#include <cstdint>
#include <list> #include <list>
#include <string> #include <string>