diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-11 17:01:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-11 17:01:14 +0100 |
| commit | d5ed23438a37a447a9011914dda2f058c15a15fc (patch) | |
| tree | c59fc0307a48add8a1e67ee92f2d811c35fa2980 | |
| parent | 5bbaf0c9f170d1e18b4fd82da8685e11aa74811f (diff) | |
| download | mpd-d5ed23438a37a447a9011914dda2f058c15a15fc.tar.gz mpd-d5ed23438a37a447a9011914dda2f058c15a15fc.tar.xz mpd-d5ed23438a37a447a9011914dda2f058c15a15fc.zip | |
decoder/flac: removed the fake flac_ogg_init() fallback
Don't even try to call it with an old libFLAC API.
| -rw-r--r-- | src/decoder/flac_compat.h | 2 | ||||
| -rw-r--r-- | src/decoder/flac_plugin.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/decoder/flac_compat.h b/src/decoder/flac_compat.h index 90cf71ea9..6d2cbb920 100644 --- a/src/decoder/flac_compat.h +++ b/src/decoder/flac_compat.h @@ -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) diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c index f6a6cf39f..f45cf789a 100644 --- a/src/decoder/flac_plugin.c +++ b/src/decoder/flac_plugin.c @@ -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, |