Merge master.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index c94b8d8ac22ae697db346eb33c25afedb9b83a2d..8aaa54f84afab6973938e83eb138a60d6a2fa9c3 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -43,7 +43,7 @@ class FFmpegContent;
 class FFmpeg
 {
 public:
-       FFmpeg (boost::shared_ptr<const FFmpegContent>, bool);
+       FFmpeg (boost::shared_ptr<const FFmpegContent>);
        virtual ~FFmpeg ();
 
        boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@ -52,11 +52,11 @@ public:
 
        int avio_read (uint8_t *, int);
        int64_t avio_seek (int64_t, int);
-       int64_t avio_length ();
 
 protected:
        AVCodecContext* video_codec_context () const;
        AVCodecContext* audio_codec_context () const;
+       AVCodecContext* subtitle_codec_context () const;
        
        boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -68,7 +68,8 @@ protected:
        AVFormatContext* _format_context;
        AVPacket _packet;
        AVFrame* _frame;
-       
+
+       /** Index of video stream within AVFormatContext */
        int _video_stream;
 
        /* It would appear (though not completely verified) that one must have
@@ -78,9 +79,8 @@ protected:
        static boost::mutex _mutex;
 
 private:
-       void setup_general (bool);
-       void setup_video ();
-       void setup_audio ();
+       void setup_general ();
+       void setup_decoders ();
 };
 
 #endif