X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=ca703f52b0a4a372437b5cf226d7fadda888c5c4;hp=5eacf63bea0d35b32966fdfcdd2577c1784f01d1;hb=3367017659e639aa8925ff4c607f1d41d24e657e;hpb=6f5030f4b257aba7ea4265ef3ae35d96477bbfc3

diff --git a/mp3_afh.c b/mp3_afh.c
index 5eacf63b..ca703f52 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -17,15 +17,12 @@
  */
 
 #include <regex.h>
-#include <osl.h>
 
 #include "para.h"
 #include "error.h"
 #include "afh.h"
 #include "string.h"
 
-/** \cond some defines and structs which are only used in this file */
-
 /*
  * MIN_CONSEC_GOOD_FRAMES defines how many consecutive valid MP3 frames we need
  * to see before we decide we are looking at a real MP3 file
@@ -48,7 +45,6 @@ struct mp3header {
 	unsigned int emphasis;
 };
 
-/** \endcond */
 static const int frequencies[3][4] = {
 	{22050,24000,16000,50000}, /* MPEG 2.0 */
 	{44100,48000,32000,50000}, /* MPEG 1.0 */
@@ -421,7 +417,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);