From 85577827106626d3f13e6b19606ea660f9e99662 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 6 Jan 2010 20:34:34 +0000 Subject: fixed buffer size git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1484 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 2 +- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/Input/ffmpeg') diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 012abd36a..174f8f693 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -104,7 +104,7 @@ bool DecoderFFmpeg::initialize() av_register_all(); AVProbeData pd; - uint8_t buf[2048]; + uint8_t buf[2048 + AVPROBE_PADDING_SIZE]; pd.filename = m_path.toLocal8Bit().constData(); pd.buf_size = input()->peek((char*)buf, sizeof(buf)); pd.buf = buf; diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 5af4e41d6..50373deb7 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -83,7 +83,10 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.name = tr("FFmpeg Plugin"); properties.filter = filters.join(" "); properties.description = tr("FFmpeg Formats"); - //properties.contentType = ""; + if(filters.contains("*.wma")) + properties.contentType += "audio/x-ms-wma"; + if(filters.contains("*.mp3")) + properties.contentType += " audio/mpeg"; properties.shortName = "ffmpeg"; properties.hasAbout = TRUE; properties.hasSettings = TRUE; -- cgit v1.2.3-13-gbd6f