From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 35 +---------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp') diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 10bb08a2c..4728a8f7f 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -18,11 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include #include #include -#include -#include - extern "C"{ #include #include @@ -92,8 +90,6 @@ const DecoderProperties DecoderFFmpegFactory::properties() const filters << "*.wma" << "*.ape" << "*.tta" << "*.m4a" << "*.aac" << "*.ra" << "*.shn" << "*.vqf" << "*.ac3"; filters = settings.value("FFMPEG/filters", filters).toStringList(); - //remove unsupported filters -#if (LIBAVCODEC_VERSION_INT >= ((54<<16) + (51<<8) + 100)) //libav 10 if(!avcodec_find_decoder(AV_CODEC_ID_WMAV1)) filters.removeAll("*.wma"); if(!avcodec_find_decoder(AV_CODEC_ID_APE)) @@ -118,33 +114,6 @@ const DecoderProperties DecoderFFmpegFactory::properties() const filters.removeAll("*.mka"); if(!avcodec_find_decoder(AV_CODEC_ID_TWINVQ)) filters.removeAll("*.vqf"); -#else - if(!avcodec_find_decoder(CODEC_ID_WMAV1)) - filters.removeAll("*.wma"); - if(!avcodec_find_decoder(CODEC_ID_APE)) - filters.removeAll("*.ape"); - if(!avcodec_find_decoder(CODEC_ID_TTA)) - filters.removeAll("*.tta"); - if(!avcodec_find_decoder(CODEC_ID_AAC)) - filters.removeAll("*.aac"); - if(!avcodec_find_decoder(CODEC_ID_MP3)) - filters.removeAll("*.mp3"); - if(!avcodec_find_decoder(CODEC_ID_AAC) && !avcodec_find_decoder(CODEC_ID_ALAC)) - filters.removeAll("*.m4a"); - if(!avcodec_find_decoder(CODEC_ID_RA_288)) - filters.removeAll("*.ra"); - if(!avcodec_find_decoder(CODEC_ID_SHORTEN)) - filters.removeAll("*.shn"); - if(!avcodec_find_decoder(CODEC_ID_EAC3)) - filters.removeAll("*.ac3"); - if(!avcodec_find_decoder(CODEC_ID_DTS)) - filters.removeAll("*.dts"); - if(!avcodec_find_decoder(CODEC_ID_TRUEHD)) - filters.removeAll("*.mka"); - if(!avcodec_find_decoder(CODEC_ID_TWINVQ)) - filters.removeAll("*.vqf"); -#endif - DecoderProperties properties; properties.name = tr("FFmpeg Plugin"); @@ -281,5 +250,3 @@ QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent) translator->load(QString(":/ffmpeg_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(ffmpeg,DecoderFFmpegFactory) -- cgit v1.2.3-13-gbd6f