Try to fix clashes caused by ERROR, WARNING etc. as variables.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 8819954db0ef06c02c810b8647b6ea6719607c36..d4b4fa1c02984f8690c42bd264434b5266cff52e 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -29,7 +29,6 @@
 #include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
 #include "util.h"
 #include "decoder.h"
@@ -39,6 +38,7 @@ extern "C" {
 #include "ffmpeg.h"
 
 class Film;
+class FilterGraph;
 class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -57,12 +57,10 @@ public:
 private:
        friend class ::ffmpeg_pts_offset_test;
 
-       /* No copy construction */
-       FFmpegDecoder (FFmpegDecoder const &);
-       FFmpegDecoder& operator= (FFmpegDecoder const &);
-
        static double compute_pts_offset (double, double, float);
 
+       void flush ();
+
        void setup_subtitle ();
 
        AVSampleFormat audio_sample_format () const;
@@ -76,7 +74,7 @@ private:
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
        AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-       AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
+       AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
        
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;