Merge branch 'v0.16.x'

NEWS

@@ -40,6 +40,11 @@ ver 0.17 (2011/??/??)
 * systemd socket activation
 
 
+ver 0.16.9 (2012/??/??)
+* decoder:
+  - ffmpeg: support WebM
+
+
 ver 0.16.8 (2012/04/04)
 * fix for libsamplerate assertion failure
 * decoder:

src/decoder/ffmpeg_decoder_plugin.c

@@ -330,7 +330,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
 
 		if (len < 0) {
 			/* if error, we skip the frame */
-			g_message("decoding failed\n");
+			g_message("decoding failed, frame skipped\n");
 			break;
 		}
 
@@ -652,7 +652,8 @@ static const char *const ffmpeg_suffixes[] = {
 	"ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd",
 	"sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts",
 	"tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc",
-	"vp6", "vmd", "wav", "wma", "wmv", "wsaud", "wsvga", "wv", "wve",
+	"vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv",
+	"wve",
 	NULL
 };
 
@@ -716,6 +717,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"video/msvideo",
 	"video/ogg",
 	"video/theora",
+	"video/webm",
 	"video/x-dv",
 	"video/x-flv",
 	"video/x-matroska",

src/decoder_thread.c

@@ -126,6 +126,8 @@ decoder_stream_decode(const struct decoder_plugin *plugin,
 	assert(input_stream->ready);
 	assert(decoder->dc->state == DECODE_STATE_START);
 
+	g_debug("probing plugin %s", plugin->name);
+
 	if (decoder->dc->command == DECODE_COMMAND_STOP)
 		return true;
 
@@ -157,6 +159,8 @@ decoder_file_decode(const struct decoder_plugin *plugin,
 	assert(g_path_is_absolute(path));
 	assert(decoder->dc->state == DECODE_STATE_START);
 
+	g_debug("probing plugin %s", plugin->name);
+
 	if (decoder->dc->command == DECODE_COMMAND_STOP)
 		return true;