projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a62857
)
Fix bad implicit cast causing incorrect FFmpegContent::audio_length() results.
author
Carl Hetherington
<cth@carlh.net>
Tue, 25 Mar 2014 20:33:24 +0000
(20:33 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 25 Mar 2014 20:33:24 +0000
(20:33 +0000)
src/lib/ffmpeg_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index b7551c96af36ed3a85e47671ac6e1237a8d96499..b39113fd1a39ca43def767e34c861460f3ba3714 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-271,7
+271,7
@@
AudioContent::Frame
FFmpegContent::audio_length () const
{
int const cafr = content_audio_frame_rate ();
FFmpegContent::audio_length () const
{
int const cafr = content_audio_frame_rate ();
-
int const vfr
= video_frame_rate ();
+
float const vfr
= video_frame_rate ();
VideoContent::Frame const vl = video_length_after_3d_combine ();
boost::mutex::scoped_lock lm (_mutex);
VideoContent::Frame const vl = video_length_after_3d_combine ();
boost::mutex::scoped_lock lm (_mutex);