summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-10 16:46:08 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-10 16:46:08 +0100
commitf0d79f2ee79becbcb7bc9065155eaa0963a6aa99 (patch)
tree1820ffa94cd39d2c60382fbc66dc0f1a202a6f13 /src/lib/ffmpeg_content.h
parent611f2241c6732c2c38d87e129e51cf9d8d7a08b8 (diff)
Add SubtitleContent.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index c5ccee77a..5b9f1f579 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -23,6 +23,7 @@
#include <boost/enable_shared_from_this.hpp>
#include "video_content.h"
#include "audio_content.h"
+#include "subtitle_content.h"
class Filter;
@@ -79,7 +80,7 @@ public:
static int const FILTERS;
};
-class FFmpegContent : public VideoContent, public AudioContent
+class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
{
public:
FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);