From: Andre Noll <maan@systemlinux.org>
Date: Sat, 13 Aug 2011 10:56:21 +0000 (+0200)
Subject: Merge branch 't/mp3_frame_padding'
X-Git-Tag: v0.4.8~7
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=85bbc6ae5732ffb1269dea6dedbbe81544cebe96;hp=af3da6f54673a9af52e26465552db20e62d0e706;p=paraslash.git

Merge branch 't/mp3_frame_padding'
---

diff --git a/mp3_afh.c b/mp3_afh.c
index b83343ed..b0d44ec9 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -420,7 +420,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		if (ret < 0)
 			continue;
 		fl = ret;
-		tmp.tv_sec = fl;
+		tmp.tv_sec = fl - header.padding;
 		tmp.tv_usec = 0;
 		tv_divide(br * 125, &tmp, &cct);
 		tv_add(&cct, &total_time, &tmp);