X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=f5bbbd31e27654ae1d5da742842ab0d07af4fd50;hp=9f82be9c3751e18a404591a8ee900e318d1e63d2;hb=36774ee2b48f0bfde43b743592e5816ff58bb7d2;hpb=3ef438f90729d78ad579bbeb7933b3cf4f09c10c 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 &);