X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=d72d85e7fb3720d67feab92fc140d4f01acdde4e;hp=d0be0ad95459390e37879870b349e88783618509;hb=e65bdaa6b207d5cd409acaa5d0d33fe85dd7a28d;hpb=badcf6125a8e0b2845348aca46d288f141e4f509 diff --git a/mp3_afh.c b/mp3_afh.c index d0be0ad9..d72d85e7 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2009 Andre Noll + * Copyright (C) 2003-2011 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);