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

decoder/ogg_codec: return UNKNOWN on error

Browse Source
This commit is contained in:
Max Kellermann 2012-09-04 13:46:12 +02:00
parent ebf481e1a1
commit 7102ed8026
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/ogg_codec.c
View File

@ -33,7 +33,7 @@ ogg_codec_detect(struct decoder *decoder, struct input_stream *is)
unsigned char buf[41]; unsigned char buf[41];
size_t r = decoder_read(decoder, is, buf, sizeof(buf)); size_t r = decoder_read(decoder, is, buf, sizeof(buf));
if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0) if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0)
return OGG_CODEC_VORBIS; return OGG_CODEC_UNKNOWN;
if ((memcmp(buf + 29, "FLAC", 4) == 0 && if ((memcmp(buf + 29, "FLAC", 4) == 0 &&
memcmp(buf + 37, "fLaC", 4) == 0) || memcmp(buf + 37, "fLaC", 4) == 0) ||

1
src/decoder/ogg_codec.h
View File

@ -27,6 +27,7 @@
#include "decoder_api.h" #include "decoder_api.h"
enum ogg_codec { enum ogg_codec {
OGG_CODEC_UNKNOWN,
OGG_CODEC_VORBIS, OGG_CODEC_VORBIS,
OGG_CODEC_FLAC, OGG_CODEC_FLAC,
}; };