diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 03:28:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 150f708d27b25d5b5d4e486d03c5bc4078027997 (patch) | |
| tree | 56b65e0d0f11f1f9f469d6069985f5f1a1c3b831 /src/lib/ffmpeg_content.h | |
| parent | a4ad6395a27e8ccb25af3b05f815d318312ae1b7 (diff) | |
Fix some confusions with FFmpeg audio streams.
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index f39414a61..de222b0de 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,8 +63,6 @@ public: void set_default_colour_conversion (); - std::vector<AudioStreamPtr> audio_streams () const; - bool has_text_subtitles () const; bool has_image_subtitles () const; @@ -82,10 +80,7 @@ public: return _subtitle_stream; } - std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const { - boost::mutex::scoped_lock lm (_mutex); - return _audio_streams; - } + std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const; std::vector<Filter const *> filters () const { boost::mutex::scoped_lock lm (_mutex); @@ -112,7 +107,6 @@ private: std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams; boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream; - std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams; boost::optional<ContentTime> _first_video; /** Video filters that should be used when generating DCPs */ std::vector<Filter const *> _filters; |