aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-09-04 13:46:12 +0200
committerMax Kellermann <max@duempel.org>2012-09-04 13:46:12 +0200
commit7102ed802638e31f8a8391b51a2989cd087748d1 (patch)
treedd19a719fc7c401b376599a105d25c5e24320677
parentebf481e1a1d129f8ce9109ea97a77e5a55da128e (diff)
downloadmpd-7102ed802638e31f8a8391b51a2989cd087748d1.tar.gz
mpd-7102ed802638e31f8a8391b51a2989cd087748d1.tar.xz
mpd-7102ed802638e31f8a8391b51a2989cd087748d1.zip
decoder/ogg_codec: return UNKNOWN on error
-rw-r--r--src/decoder/ogg_codec.c2
-rw-r--r--src/decoder/ogg_codec.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/decoder/ogg_codec.c b/src/decoder/ogg_codec.c
index 7d05db8e7..e016e5181 100644
--- a/src/decoder/ogg_codec.c
+++ b/src/decoder/ogg_codec.c
@@ -33,7 +33,7 @@ ogg_codec_detect(struct decoder *decoder, struct input_stream *is)
unsigned char buf[41];
size_t r = decoder_read(decoder, is, buf, sizeof(buf));
if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0)
- return OGG_CODEC_VORBIS;
+ return OGG_CODEC_UNKNOWN;
if ((memcmp(buf + 29, "FLAC", 4) == 0 &&
memcmp(buf + 37, "fLaC", 4) == 0) ||
diff --git a/src/decoder/ogg_codec.h b/src/decoder/ogg_codec.h
index ac2cdc0ed..d99758cad 100644
--- a/src/decoder/ogg_codec.h
+++ b/src/decoder/ogg_codec.h
@@ -27,6 +27,7 @@
#include "decoder_api.h"
enum ogg_codec {
+ OGG_CODEC_UNKNOWN,
OGG_CODEC_VORBIS,
OGG_CODEC_FLAC,
};