projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Innocuous build fixes.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index 9f82be9c3751e18a404591a8ee900e318d1e63d2..f5bbbd31e27654ae1d5da742842ab0d07af4fd50 100644
(file)
--- 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;
struct ffmpeg_pts_offset_test;
struct audio_sampling_rate_test;
-class FFmpegContentProperty
: public VideoContentProperty
+class FFmpegContentProperty
{
public:
static int const SUBTITLE_STREAMS;
{
public:
static int const SUBTITLE_STREAMS;
@@
-70,9
+70,7
@@
public:
/* SubtitleContent */
bool has_text_subtitles () const;
bool has_image_subtitles () const;
/* 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 &);
void set_filters (std::vector<Filter const *> const &);