diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-23 23:17:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-23 23:17:36 +0000 |
| commit | 68f662ac50a00ad986e3bd258c3f7daac374ab26 (patch) | |
| tree | 2b8d4d7050ea1cd594997198fe05f3f4bbf57c21 /src/lib/ffmpeg_examiner.h | |
| parent | a3c4945f77fa8e7123c30026654cb86e99343f50 (diff) | |
Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress reporting when scanning a file for length.
Diffstat (limited to 'src/lib/ffmpeg_examiner.h')
| -rw-r--r-- | src/lib/ffmpeg_examiner.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index c24d2ebcf..b873222c1 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ class FFmpegSubtitleStream; class FFmpegExaminer : public FFmpeg, public VideoExaminer { public: - FFmpegExaminer (boost::shared_ptr<const FFmpegContent>); + FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ()); boost::optional<float> video_frame_rate () const; dcp::Size video_size () const; |