diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-02-10 21:09:43 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-02-10 21:09:43 +0000 |
| commit | c42798f38f81582ab0e4ce705c000e7ab387ab31 (patch) | |
| tree | 6cb6200d56658d7779ef4b2cb412b192668ab3dc | |
| parent | c820141600c192a62fb416311977982c87a8f174 (diff) | |
| download | qmmp-c42798f38f81582ab0e4ce705c000e7ab387ab31.tar.gz qmmp-c42798f38f81582ab0e4ce705c000e7ab387ab31.tar.bz2 qmmp-c42798f38f81582ab0e4ce705c000e7ab387ab31.zip | |
using AV_VERSION_INT macro
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7850 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/settingsdialog.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h index 3178f57d6..79ebafdc3 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2013 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,7 @@ extern "C"{ #include <libavformat/avformat.h> #include <libavcodec/avcodec.h> -#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0)) +#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,32,0)) #include <libavutil/dict.h> #endif } diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index a7944929b..07467fe8c 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2016 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) QStringList filters; filters << "*.wma" << "*.ape" << "*.tta" << "*.m4a" << "*.aac" << "*.ra" << "*.shn" << "*.vqf" << "*.ac3"; filters = settings.value("FFMPEG/filters", filters).toStringList(); -#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10 +#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,34,0)) //libav 10 ui.wmaCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_WMAV1)); ui.wmaCheckBox->setChecked(filters.contains("*.wma") && avcodec_find_decoder(AV_CODEC_ID_WMAV1)); ui.apeCheckBox->setEnabled(avcodec_find_decoder(AV_CODEC_ID_APE)); |