X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=df7b56edca41e9ecd5475c2f0a9658f1a1b855e5;hb=3e0e3b10667d8ba2882fb307de3696e66fc357df;hp=fccc7ad9973f10a5afe4f505e8be1039e99dff36;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index fccc7ad99..df7b56edc 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -49,7 +49,7 @@ class FFmpegContent : public Content public: FFmpegContent (boost::filesystem::path); FFmpegContent (cxml::ConstNodePtr, int version, std::list &); - FFmpegContent (std::vector >); + FFmpegContent (std::vector>); std::shared_ptr shared_from_this () { return std::dynamic_pointer_cast (Content::shared_from_this ()); @@ -73,7 +73,7 @@ public: void set_filters (std::vector const &); - std::vector > subtitle_streams () const { + std::vector> subtitle_streams () const { boost::mutex::scoped_lock lm (_mutex); return _subtitle_streams; } @@ -83,7 +83,7 @@ public: return _subtitle_stream; } - std::vector > ffmpeg_audio_streams () const; + std::vector> ffmpeg_audio_streams () const; std::vector filters () const { boost::mutex::scoped_lock lm (_mutex); @@ -105,7 +105,7 @@ private: friend struct ffmpeg_pts_offset_test; friend struct audio_sampling_rate_test; - std::vector > _subtitle_streams; + std::vector> _subtitle_streams; std::shared_ptr _subtitle_stream; boost::optional _first_video; /** Video filters that should be used when generating DCPs */