From 1551cfa8e50ed10bf1c6fb8465ac3b6387316737 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 10 Feb 2013 15:30:41 +0000 Subject: fixed libav 0.8.x support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3214 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 2 +- src/plugins/Input/ffmpeg/decoder_ffmpeg.h | 2 +- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 2 +- src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 9fd9146c4..7eb39dfd5 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -58,7 +58,7 @@ static int64_t ffmpeg_seek(void *data, int64_t offset, int whence) // Decoder class -#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(42<<8)+4)) +#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(34<<8)+0)) DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i) : Decoder(i) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index eacc02ce9..97497c22b 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -68,7 +68,7 @@ private: int64_t m_seekTime; qint64 m_skipBytes; -#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(42<<8)+4)) +#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(34<<8)+0)) qint64 ffmpeg_decode(); AVIOContext *m_stream; AVFrame *m_decoded_frame; diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 4ad80a557..1184621d5 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -135,7 +135,7 @@ Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input) QList DecoderFFmpegFactory::createPlayList(const QString &fileName, bool useMetaData) { -#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(42<<8)+4)) +#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(34<<8)+0)) QList list; avcodec_register_all(); avformat_network_init(); diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 340faacd4..0e9545595 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -20,7 +20,7 @@ #include "ffmpegmetadatamodel.h" -#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(42<<8)+4)) +#if (LIBAVCODEC_VERSION_INT >= ((53<<16)+(34<<8)+0)) FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { -- cgit v1.2.3-13-gbd6f