Merge remote branch 'origin/v0.15.x'

This commit is contained in:
Max Kellermann
2009-11-11 15:14:20 +01:00
3 changed files with 18 additions and 14 deletions

View File

@@ -261,6 +261,10 @@ oggflac_tag_dup(const char *file)
return NULL;
}
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek(&input_stream, 0, SEEK_SET);
flac_data_init(&data, NULL, &input_stream);
data.tag = tag_new();
@@ -292,6 +296,10 @@ oggflac_decode(struct decoder * mpd_decoder, struct input_stream *input_stream)
if (ogg_stream_type_detect(input_stream) != FLAC)
return;
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek(input_stream, 0, SEEK_SET);
flac_data_init(&data, mpd_decoder, input_stream);
if (!(decoder = full_decoder_init_and_read_metadata(&data, 0))) {