diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-05-08 18:40:33 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-05-08 18:40:33 +0000 |
| commit | 5c583bfdd4a74273576867191d0145227a5d63d7 (patch) | |
| tree | 533b19c9e630bc5ebb4fb803a663490be40cf45c | |
| parent | 3452c0a567606f3fa990dde2b4e205b4d98a59c7 (diff) | |
| download | qmmp-5c583bfdd4a74273576867191d0145227a5d63d7.tar.gz qmmp-5c583bfdd4a74273576867191d0145227a5d63d7.tar.bz2 qmmp-5c583bfdd4a74273576867191d0145227a5d63d7.zip | |
fixed m4a support with enabled aac plugin
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@933 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/aac/decoderaacfactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index 45142de26..dce8c0ef4 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -31,9 +31,7 @@ bool DecoderAACFactory::supports(const QString &source) const { - - return (source.right(4).toLower() == ".aac") - || (source.right(4).toLower() == ".m4a"); + return (source.right(4).toLower() == ".aac"); } bool DecoderAACFactory::canDecode(QIODevice *) const diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 81304eb24..00930f864 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -108,10 +108,13 @@ QList<FileInfo *> DecoderFFmpegFactory::createPlayList(const QString &fileName, AVFormatContext *in; if (av_open_input_file(&in, fileName.toLocal8Bit(), NULL,0, NULL) < 0) + { + qDebug("DecoderFFmpegFactory: unable to open file"); return list; + } FileInfo *info = new FileInfo(fileName); av_find_stream_info(in); - av_read_play(in); + if (useMetaData) { info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(in->album).trimmed()); |
