diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-11 18:25:52 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-05-11 18:25:52 +0000 |
| commit | 0a29533bd30a575ba9f892014775eddd22e53ec8 (patch) | |
| tree | c041f8909f37d457a8886a7ac23565835ce7a2a9 /src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | |
| parent | 93905738ca804ceee7aba1cd26d7512ef2a99826 (diff) | |
| download | qmmp-0a29533bd30a575ba9f892014775eddd22e53ec8.tar.gz qmmp-0a29533bd30a575ba9f892014775eddd22e53ec8.tar.bz2 qmmp-0a29533bd30a575ba9f892014775eddd22e53ec8.zip | |
added shorten audio format
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1731 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 37f54d017..2e6f163a1 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -54,6 +54,9 @@ bool DecoderFFmpegFactory::supports(const QString &source) const QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QStringList filters; filters << "*.wma" << "*.ape"; +#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) + filters << "*.shn"; +#endif filters = settings.value("FFMPEG/filters", filters).toStringList(); foreach(QString filter, filters) { @@ -74,6 +77,9 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const #else filters << "*.wma"; #endif +#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) + filters << "*.shn"; +#endif filters = settings.value("FFMPEG/filters", filters).toStringList(); AVProbeData pd; @@ -107,6 +113,9 @@ const DecoderProperties DecoderFFmpegFactory::properties() const #else filters << "*.wma"; #endif +#if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(20<<8)+0)) + filters << "*.shn"; +#endif filters = settings.value("FFMPEG/filters", filters).toStringList(); DecoderProperties properties; properties.name = tr("FFmpeg Plugin"); @@ -119,6 +128,8 @@ const DecoderProperties DecoderFFmpegFactory::properties() const if(filters.contains("*.aac")) properties.contentType += " audio/aac audio/aacp"; if(filters.contains("*.m4a")) + properties.contentType += " audio/x-ffmpeg-shorten"; + if(filters.contains("*.shn")) properties.contentType += " audio/3gpp audio/3gpp2 audio/mp4 audio/MP4A-LATM audio/mpeg4-generic"; properties.contentType = properties.contentType.trimmed(); properties.shortName = "ffmpeg"; |