X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg.c;h=e5647b26eca11e8ce975d69034944174fb973164;hp=b38a8f4979a6dfccf4578f314b4914536546b05a;hb=db34194eaab9819772bd55ea1ab08c719ed8f1c8;hpb=1d480ee5ac809f9f195d0f4dd490ffb350fd0633 diff --git a/ogg.c b/ogg.c index b38a8f49..e5647b26 100644 --- a/ogg.c +++ b/ogg.c @@ -36,7 +36,7 @@ static FILE *infile; static int header_len, oggbuf_len, vi_channels; static char *header, *oggbuf; static ssize_t *chunk_table, max_chunk_len; -struct audio_format *af; +struct audio_format_handler *af; static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal, num_chunks; @@ -170,8 +170,8 @@ static void ogg_compute_chunk_table(double time_total) break; pos = ov_raw_tell(oggvorbis_file); diff = pos - old_pos; - max_chunk_len = MAX(max_chunk_len, diff); - min = (i == 1)? diff : MIN(min, diff); + max_chunk_len = PARA_MAX(max_chunk_len, diff); + min = (i == 1)? diff : PARA_MIN(min, diff); chunk_table[i] = pos; if (i < 11 || !((i - 1) % 1000)|| i > num - 11) PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "