diff options
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.h')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGReader.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h index 26e66859451..a83477b50d6 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h @@ -49,8 +49,6 @@ extern "C" { * \warning Seeking may not be accurate! Moreover the position is updated after * a buffer reading call. So calling getPosition right after seek * normally results in a wrong value. - * \warning Playback of an ogg with some outdated ffmpeg versions results in a - * segfault on windows. */ class AUD_FFMPEGReader : public AUD_IReader { @@ -61,11 +59,6 @@ private: int m_position; /** - * The playback buffer. - */ - AUD_Buffer m_buffer; - - /** * The specification of the audio data. */ AUD_DeviceSpecs m_specs; @@ -91,9 +84,9 @@ private: AVCodecContext* m_codecCtx; /** - * The ByteIOContext to read the data from. + * The AVIOContext to read the data from. */ - ByteIOContext* m_byteiocontext; + AVIOContext* m_aviocontext; /** * The stream ID in the file. @@ -167,7 +160,7 @@ public: virtual int getLength() const; virtual int getPosition() const; virtual AUD_Specs getSpecs() const; - virtual void read(int & length, sample_t* & buffer); + virtual void read(int& length, bool& eos, sample_t* buffer); }; #endif //AUD_FFMPEGREADER |