diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 16:43:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 36774ee2b48f0bfde43b743592e5816ff58bb7d2 (patch) | |
| tree | 1974d8e7e1b05338429bd40da57092d6e5a0e59a /src/lib/ffmpeg_content.h | |
| parent | 3ef438f90729d78ad579bbeb7933b3cf4f09c10c (diff) | |
Innocuous build fixes.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 9f82be9c3..f5bbbd31e 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -33,7 +33,7 @@ class VideoContent; struct ffmpeg_pts_offset_test; struct audio_sampling_rate_test; -class FFmpegContentProperty : public VideoContentProperty +class FFmpegContentProperty { public: static int const SUBTITLE_STREAMS; @@ -70,9 +70,7 @@ public: /* SubtitleContent */ bool has_text_subtitles () const; bool has_image_subtitles () const; - double subtitle_video_frame_rate () const { - return video_frame_rate (); - } + double subtitle_video_frame_rate () const; void set_filters (std::vector<Filter const *> const &); |