From 1e27d03783c264e899ccb96ebcbcff76f131cc14 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 24 Jul 2010 12:13:43 +0000 Subject: fixed video detection bug (reported by Gennadi Motsyo) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1809 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mad/decodermadfactory.cpp | 3 --- src/qmmp/qmmpaudioengine.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index e230b80c9..3e38cb4b0 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -64,9 +64,6 @@ bool DecoderMADFactory::canDecode(QIODevice *input) const if (input->peek(buf,sizeof(buf)) == sizeof(buf)) { - if(!memcmp(buf, "FLV", 3)) //skip flv files - return false; - struct mad_stream stream; struct mad_header header; int dec_res; diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index 778ebf13b..dc5c4462c 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -115,7 +115,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source) factory = Decoder::findByPath(source->url()); if(!factory) factory = Decoder::findByMime(source->contentType()); - if(!factory && source->ioDevice()) + if(!factory && source->ioDevice() && source->url().contains("://")) //ignore content of local files factory = Decoder::findByContent(source->ioDevice()); if(!factory && source->url().contains("://")) factory = Decoder::findByProtocol(source->url().section("://",0,0)); -- cgit v1.2.3-13-gbd6f