X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=ca703f52b0a4a372437b5cf226d7fadda888c5c4;hp=980649c85e826cd136cc75321d5b0c731d938dd9;hb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0;hpb=9b565c60fd159e12d255bb18db9dbff066deebea diff --git a/mp3_afh.c b/mp3_afh.c index 980649c8..ca703f52 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2010 Andre Noll + * Copyright (C) 2003-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,8 +23,6 @@ #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 @@ -47,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 */ @@ -420,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);