summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-02 18:17:35 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-02 18:17:35 +0100
commit40b3ced17b7fff8badfaa8ec2201a8186cdc7dc2 (patch)
tree38c13732a1d05e7b4c925e651caa25aa6f6edd4c /src/lib/ffmpeg_content.h
parent3967bd6a07b436a6b2eb8d0f8f634fdc11689c75 (diff)
Rename AudioContent frame_rate methods and move resampled_audio_frame_rate into AudioContent.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index d86c90af9..1ab0a92d0 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -146,8 +146,7 @@ public:
/* AudioContent */
int audio_channels () const;
ContentTime audio_length () const;
- int content_audio_frame_rate () const;
- int output_audio_frame_rate () const;
+ int audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
boost::filesystem::path audio_analysis_path () const;