X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=394e514093e974e6fdc9b04d1c4748f741a7b2d4;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=3852f51a5fca2d83c87f6286050b8fe2d7537d8c;hpb=a332bd6be323f03dad5b180fb237afe54f1bf81e;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 3852f51a5..394e51409 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -31,7 +31,7 @@ class Job; class FFmpegExaminer : public FFmpeg, public VideoExaminer { public: - FFmpegExaminer (boost::shared_ptr, boost::shared_ptr job = boost::shared_ptr ()); + FFmpegExaminer (std::shared_ptr, std::shared_ptr job = std::shared_ptr ()); bool has_video () const; @@ -41,11 +41,11 @@ public: boost::optional sample_aspect_ratio () const; bool yuv () const; - std::vector > subtitle_streams () const { + std::vector > subtitle_streams () const { return _subtitle_streams; } - std::vector > audio_streams () const { + std::vector > audio_streams () const { return _audio_streams; } @@ -83,14 +83,14 @@ public: private: void video_packet (AVCodecContext *, std::string& temporal_reference); - void audio_packet (AVCodecContext *, boost::shared_ptr); + void audio_packet (AVCodecContext *, std::shared_ptr); std::string stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; boost::optional frame_time (AVStream* s) const; - std::vector > _subtitle_streams; - std::vector > _audio_streams; + std::vector > _subtitle_streams; + std::vector > _audio_streams; boost::optional _first_video; /** Video length, either obtained from the header or derived by running * through the whole file. @@ -115,6 +115,6 @@ private: dcpomatic::ContentTime time; }; - typedef std::map, boost::optional > LastSubtitleMap; + typedef std::map, boost::optional > LastSubtitleMap; LastSubtitleMap _last_subtitle_start; };