aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-17 22:53:28 +0100
committerMax Kellermann <max@duempel.org>2009-02-17 22:53:28 +0100
commite30ba2e4cf45d18ff3feef8e4bbcd2d418799ea8 (patch)
treea7dc90ee2d469b127a4103dd7a285a77962ab2a4
parent867ae1cf6f61eabada56a3221bef4fd97ff3fc7e (diff)
downloadmpd-e30ba2e4cf45d18ff3feef8e4bbcd2d418799ea8.tar.gz
mpd-e30ba2e4cf45d18ff3feef8e4bbcd2d418799ea8.tar.xz
mpd-e30ba2e4cf45d18ff3feef8e4bbcd2d418799ea8.zip
faad: removed length==NULL check in faad_song_duration()
There are no callers which pass NULL here.
-rw-r--r--src/decoder/faad_plugin.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c
index b1fc2c497..244eb5141 100644
--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -187,8 +187,7 @@ faad_song_duration(struct faad_buffer *b, float *length)
size_t fileread;
size_t tagsize;
- if (length)
- *length = -1;
+ *length = -1;
fileread = b->is->size >= 0 ? b->is->size : 0;
@@ -204,9 +203,6 @@ faad_song_duration(struct faad_buffer *b, float *length)
faad_buffer_fill(b);
}
- if (length == NULL)
- return;
-
if (b->is->seekable && b->length >= 2 &&
(b->data[0] == 0xFF) && ((b->data[1] & 0xF6) == 0xF0)) {
adts_song_duration(b, length);