Only define UNICODE in src/lib/{cross_windows,util}.cc.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 5e1d0842ec771e6cccd803f4acf31442ae508006..b0769971e3e9c9f00f4812c51b3333badd6654f8 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -36,6 +36,7 @@ DCPOMATIC_ENABLE_WARNINGS
 
 struct AVFormatContext;
 struct AVFrame;
+struct AVStream;
 struct AVIOContext;
 
 class FFmpegContent;
@@ -63,7 +64,7 @@ protected:
                std::vector<std::shared_ptr<FFmpegAudioStream>> audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
                ) const;
 
-       static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
+       static FFmpegSubtitlePeriod subtitle_period (AVPacket const* packet, AVStream const* stream, AVSubtitle const & sub);
 
        std::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -73,6 +74,7 @@ protected:
        FileGroup _file_group;
 
        AVFormatContext* _format_context = nullptr;
+       std::vector<AVCodecContext*> _codec_context;
        AVFrame* _frame = nullptr;
 
        /** Index of video stream within AVFormatContext */