diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-13 14:46:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 334b94526f2c1271718a94fe97cfa843cf6ef7a1 (patch) | |
| tree | 67fa8769c7fb72ec6bff799c2a3d1b087454734a /src/lib/ffmpeg_content.h | |
| parent | 78664f8073256de51355c9162f61a4ae4fa560d7 (diff) | |
Basics of subtitle split.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index d210d63a8..da0eb48af 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -21,7 +21,6 @@ #define DCPOMATIC_FFMPEG_CONTENT_H #include "audio_content.h" -#include "subtitle_content.h" struct AVFormatContext; struct AVStream; @@ -42,7 +41,7 @@ public: static int const FILTERS; }; -class FFmpegContent : public AudioContent, public SubtitleContent +class FFmpegContent : public AudioContent { public: FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path); |