From 36774ee2b48f0bfde43b743592e5816ff58bb7d2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 12 Apr 2016 16:43:45 +0100 Subject: Innocuous build fixes. --- src/lib/ffmpeg_content.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/ffmpeg_content.h') 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 const &); -- cgit v1.2.3