Round image line sizes up to 32. Seems to help with LHS image corruption with both...

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 18c2e2aeb316fa937a253a5dbc70a9bdd7535f96..d34c22785c5338dff6f43ee97c7d74f27de1600f 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -44,6 +44,7 @@ class FilmState;
 class Options;
 class Image;
 class Log;
+class Subtitle;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
@@ -63,6 +64,7 @@ public:
        int audio_sample_rate () const;
        AVSampleFormat audio_sample_format () const;
        int64_t audio_channel_layout () const;
+       bool has_subtitles () const;
 
 private:
 
@@ -72,7 +74,6 @@ private:
        int time_base_denominator () const;
        int sample_aspect_ratio_numerator () const;
        int sample_aspect_ratio_denominator () const;
-       void overlay (boost::shared_ptr<Image> image) const;
 
        void setup_general ();
        void setup_video ();
@@ -95,6 +96,4 @@ private:
        AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
 
        AVPacket _packet;
-       AVSubtitle _subtitle;
-       bool _have_subtitle;
 };