aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-09-30 20:56:00 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-09-30 20:56:00 +0000
commit7e1a4603fe224f70fe0708f8aa91abfa2253c18f (patch)
treee5e2e7bcebda35995941d924b4d422e0536ee98a /src/plugins/Input/ffmpeg/decoder_ffmpeg.h
parent738476128af702a792e37e41e01acbb56ed55fff (diff)
downloadqmmp-7e1a4603fe224f70fe0708f8aa91abfa2253c18f.tar.gz
qmmp-7e1a4603fe224f70fe0708f8aa91abfa2253c18f.tar.bz2
qmmp-7e1a4603fe224f70fe0708f8aa91abfa2253c18f.zip
fixed mp4 aac regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1276 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.h')
-rw-r--r--src/plugins/Input/ffmpeg/decoder_ffmpeg.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
index 7c294837d..806496568 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
@@ -58,7 +58,7 @@ public:
private:
//helper functions
void fillBuffer();
- qint64 ffmpeg_decode(char *audio, qint64 maxSize);
+ qint64 ffmpeg_decode(uint8_t *audio);
AVFormatContext *ic;
AVCodecContext *c;
@@ -70,7 +70,8 @@ private:
AVPacket m_pkt;
AVPacket m_temp_pkt;
- uint8_t *m_inbuf_ptr;
+ uint8_t *m_output_buf;
+ qint64 m_output_at;
};