Merge branch 'v0.16.x'

Conflicts:
	NEWS
This commit is contained in:
Max Kellermann
2012-05-29 23:46:10 +02:00
3 changed files with 13 additions and 2 deletions

View File

@@ -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;