Move Resampler into Piece.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 401d26f1fb337b36506ea0651d9473980d0ccafb..432749c29d6aa5e41e182f406c4bd42aa7b5f305 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -78,7 +78,7 @@ using dcp::Size;
 using namespace dcpomatic;
 
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmpegContent> c, bool fast)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmpegContent> c)
        : FFmpeg (c)
        , Decoder (film)
 {
@@ -93,7 +93,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmp
        }
 
        if (c->audio) {
-               audio = make_shared<AudioDecoder>(this, c->audio, fast);
+               audio = make_shared<AudioDecoder>(this, c->audio);
        }
 
        if (c->only_text()) {
@@ -174,6 +174,8 @@ FFmpegDecoder::flush ()
                audio->flush ();
        }
 
+       Flush ();
+
        return true;
 }