diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
| commit | 3dfdd5795cf6514e15fdbece54c28f3bddc2aadc (patch) | |
| tree | 0b6a71d8d5c8be03ff424da5c5b0b42fb5f3018a /src/lib/ffmpeg_content.cc | |
| parent | 30e45dd697afc053f2d7be4ee2bc154e5061ad80 (diff) | |
Rationalise video/audio frame types.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 65a8d24f1..eb873fe65 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -163,7 +163,7 @@ FFmpegContent::examine (shared_ptr<Job> job) shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ())); - VideoContent::Frame video_length = 0; + VideoFrame video_length = 0; video_length = examiner->video_length (); film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length)); @@ -262,12 +262,12 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s) signal_changed (FFmpegContentProperty::AUDIO_STREAM); } -AudioContent::Frame +AudioFrame FFmpegContent::audio_length () const { int const cafr = content_audio_frame_rate (); int const vfr = video_frame_rate (); - VideoContent::Frame const vl = video_length (); + VideoFrame const vl = video_length (); boost::mutex::scoped_lock lm (_mutex); if (!_audio_stream) { |