X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=7b64b508aff864661aa56b8cea8cd392a9f64c05;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=34d4b1e0d341304f4f9ff903f7debcc958421a40;hpb=6f0a590bc3266f21ba577116219bd019e891d480;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 34d4b1e0d..7b64b508a 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -28,16 +28,16 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer { public: FFmpegExaminer (boost::shared_ptr, boost::shared_ptr job = boost::shared_ptr ()); - + boost::optional video_frame_rate () const; dcp::Size video_size () const; - ContentTime video_length () const; + Frame video_length () const; boost::optional sample_aspect_ratio () const; std::vector > subtitle_streams () const { return _subtitle_streams; } - + std::vector > audio_streams () const { return _audio_streams; } @@ -45,12 +45,12 @@ public: boost::optional first_video () const { return _first_video; } - + private: void video_packet (AVCodecContext *); void audio_packet (AVCodecContext *, boost::shared_ptr); void subtitle_packet (AVCodecContext *, boost::shared_ptr); - + std::string stream_name (AVStream* s) const; std::string audio_stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; @@ -62,7 +62,7 @@ private: /** Video length, either obtained from the header or derived by running * through the whole file. */ - ContentTime _video_length; + Frame _video_length; bool _need_video_length; boost::optional _last_subtitle_start;