summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-07 20:13:22 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-07 20:13:22 +0000
commitcab9a1d569396065a6e9eb39386736908564d6b4 (patch)
treeef698f132e659ab34a8783771ddc522481cbe48b /src/lib/ffmpeg_content.cc
parent978be856218cc15f059b7e267811e7302c37b24d (diff)
Add primitive subtitle view. Remove unused Film member from Decoder hierarchy.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index e9be3cc46..2b535a2ab 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -158,13 +158,13 @@ FFmpegContent::examine (shared_ptr<Job> job)
Content::examine (job);
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
-
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
take_from_video_examiner (examiner);
ContentTime video_length = examiner->video_length ();
+
+ shared_ptr<const Film> film = _film.lock ();
+ assert (film);
film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())));
{