oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/flac: removed the fake flac_ogg_init() fallback

Browse Source 
Don't even try to call it with an old libFLAC API.
This commit is contained in:
Max Kellermann 2009-11-11 17:01:14 +01:00
parent 5bbaf0c9f1
commit d5ed23438a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/flac_compat.h
View File

@ -30,8 +30,6 @@
# define flac_decoder FLAC__SeekableStreamDecoder
# define flac_new() FLAC__seekable_stream_decoder_new()
# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) (0)
# define flac_get_decode_position(x,y) \
FLAC__seekable_stream_decoder_get_decode_position(x,y)
# define flac_get_state(x) FLAC__seekable_stream_decoder_get_state(x)

4
src/decoder/flac_plugin.c
View File

@ -469,6 +469,7 @@ flac_decode_internal(struct decoder * decoder,
#endif
if (is_ogg) {
#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
if (!flac_ogg_init(flac_dec, flac_read_cb,
flac_seek_cb, flac_tell_cb,
flac_length_cb, flac_eof_cb,
@ -477,6 +478,9 @@ flac_decode_internal(struct decoder * decoder,
err = "doing Ogg init()";
goto fail;
}
#else
goto fail;
#endif
} else {
if (!flac_init(flac_dec, flac_read_cb,
flac_seek_cb, flac_tell_cb,