projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_audio_stream.cc
diff --git
a/src/lib/ffmpeg_audio_stream.cc
b/src/lib/ffmpeg_audio_stream.cc
index 05e1a3fc807ef0802772a6b41252fa6ead30df8d..9400eb60dddd6c46fc2d90853b5339e098ca40b5 100644
(file)
--- a/
src/lib/ffmpeg_audio_stream.cc
+++ b/
src/lib/ffmpeg_audio_stream.cc
@@
-39,7
+39,8
@@
FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
, AudioStream (
node->number_child<int>("FrameRate"),
node->optional_number_child<Frame>("Length").get_value_or(0),
, AudioStream (
node->number_child<int>("FrameRate"),
node->optional_number_child<Frame>("Length").get_value_or(0),
- AudioMapping (node->node_child("Mapping"), version)
+ AudioMapping(node->node_child("Mapping"), version),
+ node->optional_number_child<int>("BitDepth")
)
{
optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type>("FirstAudio");
)
{
optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type>("FirstAudio");
@@
-63,4
+64,7
@@
FFmpegAudioStream::as_xml (xmlpp::Node* root) const
if (codec_name) {
root->add_child("CodecName")->add_child_text(codec_name.get());
}
if (codec_name) {
root->add_child("CodecName")->add_child_text(codec_name.get());
}
+ if (bit_depth()) {
+ root->add_child("BitDepth")->add_child_text(raw_convert<string>(bit_depth().get()));
+ }
}
}