projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More automated renaming.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.h
diff --git
a/src/lib/ffmpeg_encoder.h
b/src/lib/ffmpeg_encoder.h
index 43c0d948bb4f75c28d9b53f44142b6b27f13fd8f..b1d07eb7f65bdeff0ebaf414be6a29afbffcf6ac 100644
(file)
--- a/
src/lib/ffmpeg_encoder.h
+++ b/
src/lib/ffmpeg_encoder.h
@@
-53,8
+53,8
@@
public:
private:
void video (boost::shared_ptr<PlayerVideo>, DCPTime);
private:
void video (boost::shared_ptr<PlayerVideo>, DCPTime);
- void audio (boost::shared_ptr<AudioBuffers>
, DCPTime
);
- void subtitle (Player
Subtitles
, DCPTimePeriod);
+ void audio (boost::shared_ptr<AudioBuffers>);
+ void subtitle (Player
Text
, DCPTimePeriod);
void setup_video ();
void setup_audio ();
void setup_video ();
void setup_audio ();