diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-06-27 10:55:12 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-06-27 10:55:12 +0000 |
| commit | 85472238d726cd67bb8f4758440d8c953e3f8532 (patch) | |
| tree | 913ea769db94baea97ac7fec4da3b9dd6f1b66b0 /src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | |
| parent | d9d9c0a27f42fb0ebe5da8d3b95b8e9ff6db0783 (diff) | |
| download | qmmp-85472238d726cd67bb8f4758440d8c953e3f8532.tar.gz qmmp-85472238d726cd67bb8f4758440d8c953e3f8532.tar.bz2 qmmp-85472238d726cd67bb8f4758440d8c953e3f8532.zip | |
added ffmpeg 3.1 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6534 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 449e55052..00de8d9aa 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -51,11 +51,19 @@ QHash<QString, QString> FFmpegMetaDataModel::audioProperties() ap.insert(tr("File size"), QString("%1 ").arg(avio_size(m_in->pb)) + " " + tr("KB")); ap.insert(tr("Bitrate"), QString("%1 "+tr("kbps")).arg(m_in->bit_rate/1000)); +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 + AVCodecParameters *c = 0; +#else AVCodecContext *c = 0; +#endif uint idx; for (idx = 0; idx < m_in->nb_streams; idx++) { +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 + c = m_in->streams[idx]->codecpar; +#else c = m_in->streams[idx]->codec; +#endif if (c->codec_type == AVMEDIA_TYPE_AUDIO) break; } @@ -69,10 +77,20 @@ QHash<QString, QString> FFmpegMetaDataModel::audioProperties() QPixmap FFmpegMetaDataModel::cover() { +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 + AVCodecParameters *c = 0; +#else AVCodecContext *c = 0; +#endif + for (uint idx = 0; idx < m_in->nb_streams; idx++) { +#if (LIBAVCODEC_VERSION_INT >= ((57<<16)+(48<<8)+0)) //ffmpeg-3.1: 57.48.101 + c = m_in->streams[idx]->codecpar; +#else c = m_in->streams[idx]->codec; +#endif + #if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 if (c->codec_type == AVMEDIA_TYPE_VIDEO && c->codec_id == AV_CODEC_ID_MJPEG) #else |