diff options
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp index 38de3e8867a..e9d045bd303 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp @@ -36,7 +36,6 @@ #include "AUD_FFMPEGFactory.h" #include "AUD_FFMPEGReader.h" -#include "AUD_Buffer.h" AUD_FFMPEGFactory::AUD_FFMPEGFactory(std::string filename) : m_filename(filename) @@ -46,13 +45,13 @@ AUD_FFMPEGFactory::AUD_FFMPEGFactory(std::string filename) : AUD_FFMPEGFactory::AUD_FFMPEGFactory(const data_t* buffer, int size) : m_buffer(new AUD_Buffer(size)) { - memcpy(m_buffer.get()->getBuffer(), buffer, size); + memcpy(m_buffer->getBuffer(), buffer, size); } -AUD_IReader* AUD_FFMPEGFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_FFMPEGFactory::createReader() { - if(m_buffer.get()) - return new AUD_FFMPEGReader(m_buffer); - else + if(m_buffer.isNull()) return new AUD_FFMPEGReader(m_filename); + else + return new AUD_FFMPEGReader(m_buffer); } |