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.cc
diff --git
a/src/lib/ffmpeg_encoder.cc
b/src/lib/ffmpeg_encoder.cc
index 29334e8ed26f85a2cb484440d4f4602f1a250ff3..f82290c6cd2f1183edb71063fd18337940ebddce 100644
(file)
--- a/
src/lib/ffmpeg_encoder.cc
+++ b/
src/lib/ffmpeg_encoder.cc
@@
-411,7
+411,7
@@
FFmpegEncoder::audio_frame (int size)
}
void
-FFmpegEncoder::subtitle (Player
Caption
, DCPTimePeriod)
+FFmpegEncoder::subtitle (Player
Text
, DCPTimePeriod)
{
}