diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-04 21:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-07 22:48:29 +0100 |
| commit | dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch) | |
| tree | e56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/lib/audio_merger.cc | |
| parent | 0d35820cf50d2789752b8776683b26d04642518d (diff) | |
std::shared_ptr
Diffstat (limited to 'src/lib/audio_merger.cc')
| -rw-r--r-- | src/lib/audio_merger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc index 74bb7717d..347a96f5a 100644 --- a/src/lib/audio_merger.cc +++ b/src/lib/audio_merger.cc @@ -31,7 +31,7 @@ using std::max; using std::list; using std::cout; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; @@ -95,7 +95,7 @@ AudioMerger::pull (DCPTime time) /** Push some data into the merger at a given time */ void -AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time) +AudioMerger::push (std::shared_ptr<const AudioBuffers> audio, DCPTime time) { DCPOMATIC_ASSERT (audio->frames() > 0); |
