diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 16:33:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 3ef438f90729d78ad579bbeb7933b3cf4f09c10c (patch) | |
| tree | 9ecb2d9657986395570b0239486dfa0efdb01f55 /src/lib/ffmpeg_content.h | |
| parent | 500a503a982e8e62884035e156e47ed61a20ef85 (diff) | |
Basic detach of FFmpegContent, ImageContent, DCPContent
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index e9cb3dacf..9f82be9c3 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -20,7 +20,6 @@ #ifndef DCPOMATIC_FFMPEG_CONTENT_H #define DCPOMATIC_FFMPEG_CONTENT_H -#include "video_content.h" #include "audio_content.h" #include "subtitle_content.h" @@ -30,6 +29,7 @@ struct AVStream; class Filter; class FFmpegSubtitleStream; class FFmpegAudioStream; +class VideoContent; struct ffmpeg_pts_offset_test; struct audio_sampling_rate_test; @@ -42,7 +42,7 @@ public: static int const FILTERS; }; -class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent +class FFmpegContent : public AudioContent, public SubtitleContent { public: FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path); @@ -108,6 +108,8 @@ public: void signal_subtitle_stream_changed (); + boost::shared_ptr<VideoContent> video; + protected: void add_properties (std::list<UserProperty> &) const; |
