Merge tag 'release-0.17.5'

2013-08-04 14:36:22 +02:00
parent fcb7233b25 d8217c364a
commit 9326ce53ec
8 changed files with 44 additions and 19 deletions
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -586,6 +586,7 @@ static const char *const ffmpeg_suffixes[] = {
 };

 static const char *const ffmpeg_mime_types[] = {
+	"application/flv",
 	"application/m4a",
 	"application/mp4",
 	"application/octet-stream",