Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index c3e627fcd7ccc60656254ee3f5f40e21e4f232f5..6c9d87097c6fc4458706317338f3dac426d863d8 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -79,6 +79,5 @@ private:
        };
 
        std::list<Buffer> _buffers;
-       DCPTime _last_pull;
        int _frame_rate;
 };