summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-03 22:58:46 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-03 22:58:46 +0100
commit82926443230084739cb673a83b2ab1f9d733a07b (patch)
tree72ff6a2564bc5950f52730b9d00151a5ebbbe00f /src/lib/ffmpeg_content.h
parent5ff10668facca32723efae3f08dfaab8a3d8bd44 (diff)
All audio content should resample if the output frame rate and content
frame rates differ; make Sndfile sources use the video-frame-rate-based calculation for output frame rate (like FFmpeg sources do). Also, fix small problems when flushing Resamplers used to get fed back to Resamplers again.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 6ab95d2fe..c15e5c10e 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -147,7 +147,6 @@ public:
int audio_channels () const;
AudioContent::Frame audio_length () const;
int content_audio_frame_rate () const;
- int output_audio_frame_rate () const;
AudioMapping audio_mapping () const;
void set_audio_mapping (AudioMapping);
boost::filesystem::path audio_analysis_path () const;