projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move video frame rate ('prepared-for') into Content.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 463722778d1fafb867044b9fc2ac05e2cd4c6737..f249a1c35da1bf47ce53545fccf1311eed0aa79c 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-296,7
+296,7
@@
operator!= (FFmpegStream const & a, FFmpegStream const & b)
DCPTime
FFmpegContent::full_length () const
{
DCPTime
FFmpegContent::full_length () const
{
- FrameRateChange const frc (
video->
frame_rate (), film()->video_frame_rate ());
+ FrameRateChange const frc (
active_video_
frame_rate (), film()->video_frame_rate ());
return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
}
return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
}
@@
-499,14
+499,6
@@
FFmpegContent::signal_subtitle_stream_changed ()
signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
}
signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
}
-void
-FFmpegContent::changed (int property)
-{
- if (property == VideoContentProperty::FRAME_RATE && subtitle) {
- subtitle->set_video_frame_rate (video->frame_rate ());
- }
-}
-
vector<shared_ptr<FFmpegAudioStream> >
FFmpegContent::ffmpeg_audio_streams () const
{
vector<shared_ptr<FFmpegAudioStream> >
FFmpegContent::ffmpeg_audio_streams () const
{