projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various small errors in emailed-KDM zip file format (#478).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_audio_stream.h
diff --git
a/src/lib/ffmpeg_audio_stream.h
b/src/lib/ffmpeg_audio_stream.h
index 31ec9d125e550daa4688a913cd0081aa0c7f9440..a754ec5748440d00d7fc38b57bbe49683d946077 100644
(file)
--- a/
src/lib/ffmpeg_audio_stream.h
+++ b/
src/lib/ffmpeg_audio_stream.h
@@
-32,6
+32,12
@@
public:
, AudioStream (frame_rate, length, channels)
{}
, AudioStream (frame_rate, length, channels)
{}
+ FFmpegAudioStream (std::string name, std::string codec_name_, int id, int frame_rate, Frame length, int channels)
+ : FFmpegStream (name, id)
+ , AudioStream (frame_rate, length, channels)
+ , codec_name (codec_name_)
+ {}
+
FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, AudioMapping mapping)
: FFmpegStream (name, id)
, AudioStream (frame_rate, length, mapping)
FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, AudioMapping mapping)
: FFmpegStream (name, id)
, AudioStream (frame_rate, length, mapping)
@@
-44,6
+50,7
@@
public:
/* XXX: should probably be locked */
boost::optional<ContentTime> first_audio;
/* XXX: should probably be locked */
boost::optional<ContentTime> first_audio;
+ boost::optional<std::string> codec_name;
private:
friend struct ffmpeg_pts_offset_test;
private:
friend struct ffmpeg_pts_offset_test;