Skip to content

M
mpd
Commit 0d24250a authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/_ogg_common: simplify the large "if" expression

parent 2050e2f8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
src/decoder/_ogg_common.c
View file @ 0d24250a
...@@ -33,12 +33,14 @@ ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream) ...@@ -33,12 +33,14 @@ ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream)
size_t r; size_t r;
r = decoder_read(NULL, inStream, buf, sizeof(buf)); r = decoder_read(NULL, inStream, buf, sizeof(buf));
if (r >= 32 && memcmp(buf, "OggS", 4) == 0 && ( if (r < 32 || memcmp(buf, "OggS", 4) != 0)
(memcmp(buf+29, "FLAC", 4) == 0 return VORBIS;
&& memcmp(buf+37, "fLaC", 4) == 0)
|| (memcmp(buf+28, "FLAC", 4) == 0) if ((memcmp(buf + 29, "FLAC", 4) == 0 &&
|| (memcmp(buf+28, "fLaC", 4) == 0))) { memcmp(buf + 37, "fLaC", 4) == 0) ||
memcmp(buf + 28, "FLAC", 4) == 0 ||
memcmp(buf + 28, "fLaC", 4) == 0)
return FLAC; return FLAC;
}
return VORBIS; return VORBIS;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment