Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 381c5cea9c9e85a48ec894326f92a482f82bf8e7..4378e241b973e53aa541d46da6afda1491e0e5f5 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -29,9 +29,10 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer
 public:
        FFmpegExaminer (boost::shared_ptr<const FFmpegContent>);
        
-       float video_frame_rate () const;
+       boost::optional<float> video_frame_rate () const;
        dcp::Size video_size () const;
        ContentTime video_length () const;
+       boost::optional<float> sample_aspect_ratio () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -46,6 +47,10 @@ public:
        }
        
 private:
+       void video_packet (AVCodecContext *);
+       void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
+       void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>);
+       
        std::string stream_name (AVStream* s) const;
        std::string audio_stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;