Merge.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 792f7dde2ea948c5046afb18cd855f29da89d331..19ef25ede0836eea85926956131c6ce9db1e15fc 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -29,11 +29,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <sigc++/sigc++.h>
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
-#include <libswresample/swresample.h>
-}
-#endif
 #include "util.h"
 
 class Job;
@@ -134,10 +129,6 @@ private:
        AVFilterContext* _buffer_src_context;
        AVFilterContext* _buffer_sink_context;
 
-#if HAVE_SWRESAMPLE    
-       SwrContext* _swr_context;
-#endif 
-
        bool _have_setup_video_filters;
        DelayLine* _delay_line;
        int _delay_in_bytes;
@@ -145,7 +136,7 @@ private:
        /* Number of audio frames that we have pushed to the encoder
           (at the DCP sample rate).
        */
-       int _audio_frames_processed;
+       int64_t _audio_frames_processed;
 };
 
 #endif