Merge vorbis+icy fixes from branch 'v0.15.x'

Conflicts:
	Makefile.am
	NEWS
	configure.ac
	src/input/curl_input_plugin.c
	src/input_stream.c
This commit is contained in:
Max Kellermann
2009-12-30 23:24:11 +01:00
11 changed files with 357 additions and 186 deletions

View File

@@ -21,6 +21,7 @@
#include "input_stream.h"
#include "input_registry.h"
#include "input_plugin.h"
#include "input/rewind_input_plugin.h"
#include <glib.h>
#include <assert.h>
@@ -57,6 +58,8 @@ input_stream_open(struct input_stream *is, const char *url, GError **error_r)
assert(is->plugin->eof != NULL);
assert(!is->seekable || is->plugin->seek != NULL);
input_rewind_open(is);
return true;
} else if (error != NULL) {
g_propagate_error(error_r, error);