decoder/faad: test "seekable" after ADTS frame check

Don't bother to check for ADIF just because the stream is not seekable.

decoder/faad: test "seekable" after ADTS frame check
54b6f8a4 · Max Kellermann · 18787ebe · 54b6f8a4
Commit 54b6f8a4 authored Jul 11, 2014 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

FaadDecoderPlugin.cxx src/decoder/FaadDecoderPlugin.cxx +5 -1

No files found.
--- a/src/decoder/FaadDecoderPlugin.cxx
+++ b/src/decoder/FaadDecoderPlugin.cxx
@@ -186,9 +186,13 @@ faad_song_duration(DecoderBuffer *buffer, InputStream &is)
 			return -1;
 	}

-	if (is.IsSeekable() && length >= 2 &&
+	if (length >= 2 &&
 	    data[0] == 0xFF && ((data[1] & 0xF6) == 0xF0)) {
 		/* obtain the duration from the ADTS header */
+
+		if (!is.IsSeekable())
+			return -1;
+
 		float song_length = adts_song_duration(buffer);

 		is.LockSeek(tagsize, SEEK_SET, IgnoreError());