Merge branch 'v0.16.x'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-04-12 08:11:33 +02:00
5 changed files with 16 additions and 4 deletions

View File

@@ -81,7 +81,7 @@ flac_tell_cb(G_GNUC_UNUSED const FLAC__StreamDecoder *fd,
struct flac_data *data = (struct flac_data *) fdata;
if (!data->input_stream->seekable)
return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
*offset = (long)(data->input_stream->offset);