diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-12-17 19:29:48 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-12-17 19:29:48 +0000 |
| commit | be4ee17cbe5294e1df0bd1ab787089eb088106e0 (patch) | |
| tree | 7cc99fcb6ba569c745764610bd4356928ea1d55c /src/plugins/Input/ffmpeg/decoder_ffmpeg.h | |
| parent | 6ae6e25f660991d7597956df1a241e2596cb4d5e (diff) | |
| download | qmmp-be4ee17cbe5294e1df0bd1ab787089eb088106e0.tar.gz qmmp-be4ee17cbe5294e1df0bd1ab787089eb088106e0.tar.bz2 qmmp-be4ee17cbe5294e1df0bd1ab787089eb088106e0.zip | |
ffmpeg plugin: latest api support (Closes issue 512)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2535 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.h')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index e5ec48a49..4c87fc291 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -48,26 +48,21 @@ public: private: //helper functions void fillBuffer(); - qint64 ffmpeg_decode(uint8_t *audio); + qint64 ffmpeg_decode(); AVFormatContext *ic; AVCodecContext *c; uint wma_st_buff, wma_idx2; int m_bitrate, wma_idx; QString m_path; - bool m_skip; qint64 m_totalTime; AVPacket m_pkt; AVPacket m_temp_pkt; -#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(102<<8)+0)) AVIOContext *m_stream; -#else - ByteIOContext *m_stream; -#endif + AVFrame *m_decoded_frame; - uint8_t *m_output_buf; qint64 m_output_at; uchar m_input_buf[INPUT_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; |