diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-25 20:33:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-25 20:33:24 +0000 |
| commit | 82f638e4170b0eb29227aefb70e0b9321addc7d3 (patch) | |
| tree | d15a296632b5ba011a4376eb41fa050a593b671b /src/lib | |
| parent | 0a62857e4412d294712cfdf227fa38ae9ef371fe (diff) | |
Fix bad implicit cast causing incorrect FFmpegContent::audio_length() results.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index b7551c96a..b39113fd1 100644 --- 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 (); - 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); |