projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index b1f2abceaa37d46a382a2e2607dcf45e930b6291..e637faf47643be48b0f3353bad5d440cb5231b62 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-136,13
+136,13
@@
public:
std::string technical_summary () const;
std::string information () const;
void as_xml (xmlpp::Node *) const;
std::string technical_summary () const;
std::string information () const;
void as_xml (xmlpp::Node *) const;
- Time full_length () const;
+
DCP
Time full_length () const;
std::string identifier () const;
/* AudioContent */
int audio_channels () const;
std::string identifier () const;
/* AudioContent */
int audio_channels () const;
- Audio
Content::
Frame audio_length () const;
+ AudioFrame audio_length () const;
int content_audio_frame_rate () const;
int output_audio_frame_rate () const;
AudioMapping audio_mapping () const;
int content_audio_frame_rate () const;
int output_audio_frame_rate () const;
AudioMapping audio_mapping () const;