projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop double-calculation of hashes.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index 09f8ed5587b0ede63b7cd9e0385093d33e9d66ac..5437c5bf35f04450ca9b2aeeabecb81044a7273a 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-23,9
+23,6
@@
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
#include "video_content.h"
#include "audio_content.h"
#include "subtitle_content.h"
-#include "audio_mapping.h"
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
struct AVFormatContext;
struct AVStream;
struct AVFormatContext;
struct AVStream;
@@
-72,6
+69,9
@@
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 ();
+ }
void set_filters (std::vector<Filter const *> const &);
void set_filters (std::vector<Filter const *> const &);