Merge master.

[dcpomatic.git] / src / lib / sndfile_decoder.cc

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 67bb25e0dc71e56fe5678c8bef2b25bd0f17c655..602014d5883d2dba1381588bb44a7036debc9c96 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -74,7 +74,7 @@ SndfileDecoder::pass ()
        /* Do things in half second blocks as I think there may be limits
           to what FFmpeg (and in particular the resampler) can cope with.
        */
-       sf_count_t const block = _sndfile_content->content_audio_frame_rate() / 2;
+       sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
        sf_count_t const this_time = min (block, _remaining);
 
        int const channels = _sndfile_content->audio_channels ();
@@ -131,7 +131,6 @@ SndfileDecoder::audio_frame_rate () const
 void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
-       Decoder::seek (t, accurate);
        AudioDecoder::seek (t, accurate);
 
        _done = t.frames (audio_frame_rate ());