summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-07 22:15:01 +0200
committerCarl Hetherington <cth@carlh.net>2021-04-07 22:15:01 +0200
commit7bc2134d658778e04f1756c255e604b4ab5a5831 (patch)
treeb5ba51f2534604a6528fbbb130fd0cfca7d6fb70 /src/lib/ffmpeg_content.h
parenta771a806291243760552988a1a7a5742bc007ee2 (diff)
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
-rw-r--r--src/lib/ffmpeg_content.h8
1 files changed, 4 insertions, 4 deletions
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<std::string> &);
- FFmpegContent (std::vector<std::shared_ptr<Content> >);
+ FFmpegContent (std::vector<std::shared_ptr<Content>>);
std::shared_ptr<FFmpegContent> shared_from_this () {
return std::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
@@ -73,7 +73,7 @@ public:
void set_filters (std::vector<Filter const *> const &);
- std::vector<std::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+ std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_streams;
}
@@ -83,7 +83,7 @@ public:
return _subtitle_stream;
}
- std::vector<std::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
+ std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams () const;
std::vector<Filter const *> 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<std::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+ std::vector<std::shared_ptr<FFmpegSubtitleStream>> _subtitle_streams;
std::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
boost::optional<dcpomatic::ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */