Merge master.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 2cda8f89d5b6263db0600454369d7732cd893c1f..6006fc08d521b2595d418fbb24138e03e6485ebc 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -57,8 +57,6 @@ private:
        bool pass ();
        void flush ();
 
-       void setup_subtitle ();
-
        AVSampleFormat audio_sample_format () const;
        int bytes_per_audio_sample () const;