diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
| commit | 64a2f1bb6a7b972607fa363631ef7a47444e8217 (patch) | |
| tree | 020c028a93f113e372e70f485857ce04dea5db3d /src/lib/ffmpeg_content.h | |
| parent | 8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (diff) | |
Various bits and pieces.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 9d842515e..d5b986996 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -80,26 +80,26 @@ public: class FFmpegContent : public VideoContent, public AudioContent { public: - FFmpegContent (boost::filesystem::path); - FFmpegContent (boost::shared_ptr<const cxml::Node>); + FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path); + FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>); FFmpegContent (FFmpegContent const &); boost::shared_ptr<FFmpegContent> shared_from_this () { return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ()); } - void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>); + void examine (boost::shared_ptr<Job>); std::string summary () const; std::string information () const; void as_xml (xmlpp::Node *) const; boost::shared_ptr<Content> clone () const; - Time length (boost::shared_ptr<const Film>) const; + Time length () const; /* AudioContent */ int audio_channels () const; ContentAudioFrame audio_length () const; int content_audio_frame_rate () const; - int output_audio_frame_rate (boost::shared_ptr<const Film>) const; + int output_audio_frame_rate () const; AudioMapping audio_mapping () const; std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const { |