diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-16 01:19:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 8008b81c0ccee843263e2a648707b71cc3ae081f (patch) | |
| tree | c91a8fa3363645ed39dccf1bc8c5bd944e7b80a3 /src/lib/audio_content.h | |
| parent | 8109f84306e024cbbe3e386db178ce00f0a32401 (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src/lib/audio_content.h')
| -rw-r--r-- | src/lib/audio_content.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index 09e7a0d12..cfce3fb83 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -34,16 +34,10 @@ class AudioContentProperty { public: -<<<<<<< 17dbd967c18aff2f3007eb86b5eee5b43f23bc4b - static int const AUDIO_STREAMS; - static int const AUDIO_GAIN; - static int const AUDIO_DELAY; - static int const AUDIO_VIDEO_FRAME_RATE; -======= static int const STREAMS; static int const GAIN; static int const DELAY; ->>>>>>> Rename video/audio/subtitle part methods. + static int const VIDEO_FRAME_RATE; }; class AudioContent : public ContentPart @@ -75,8 +69,8 @@ public: return _delay; } - double audio_video_frame_rate () const; - void set_audio_video_frame_rate (double r); + double video_frame_rate () const; + void set_video_frame_rate (double r); std::string processing_description () const; |