From e231bb9701639b20dd917865040b727af9b0b77e Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 23 Sep 2009 12:40:02 +0000
Subject: ported ffmpeg plugin (Closes issue 170)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1254 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp')

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 25321e920..370a2cc02 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -29,8 +29,8 @@
 
 // Decoder class
 
-DecoderFFmpeg::DecoderFFmpeg(QObject *parent, DecoderFactory *d, Output *o, const QString &path)
-        : Decoder(parent, d, o)
+DecoderFFmpeg::DecoderFFmpeg(const QString &path)
+        : Decoder()
 {
     m_bitrate = 0;
     m_skip = FALSE;
@@ -111,7 +111,7 @@ int DecoderFFmpeg::bitrate()
     return m_bitrate;
 }
 
-qint64 DecoderFFmpeg::readAudio(char *audio, qint64 maxSize)
+qint64 DecoderFFmpeg::read(char *audio, qint64 maxSize)
 {
     if (m_skip)
     {
@@ -153,7 +153,7 @@ qint64 DecoderFFmpeg::ffmpeg_decode(char *audio, qint64 maxSize)
     return out_size;
 }
 
-void DecoderFFmpeg::seekAudio(qint64 pos)
+void DecoderFFmpeg::seek(qint64 pos)
 {
     int64_t timestamp = int64_t(pos)*AV_TIME_BASE/1000;
     if (ic->start_time != (qint64)AV_NOPTS_VALUE)
-- 
cgit v1.2.3-13-gbd6f