aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/Input/aac/decoderaacfactory.cpp4
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp5
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());