ogg_afh.c: Kill superflous vi_channels
authorAndre Noll <maan@systemlinux.org>
Sun, 4 Mar 2007 22:39:13 +0000 (23:39 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 4 Mar 2007 22:39:13 +0000 (23:39 +0100)
ogg_afh.c

index a3e0f69..2e3ed72 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -36,7 +36,7 @@ static double chunk_time = 0.25;
 
 static OggVorbis_File *oggvorbis_file;
 static FILE *infile;
-static int header_len, vi_channels;
+static int header_len;
 static char *header;
 static ssize_t *chunk_table, max_chunk_len, num_chunks;
 static struct audio_format_handler *af;
@@ -253,7 +253,6 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        vi_sampling_rate = vi->rate;
        vi_bitrate = ov_bitrate(oggvorbis_file, 0);
        vi_bitrate_nominal = vi->bitrate_nominal;
-       vi_channels = vi->channels;
        ogg_compute_chunk_table(time_total);
        *frames = num_chunks;
        *vss_chunk_table = chunk_table;
@@ -261,7 +260,7 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                "audio_file_info2: \n"
                "audio_file_info3: \n",
                num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
-               vi_sampling_rate / 1000, vi_channels, vi_bitrate / 1000
+               vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
                );
        rewind(file);
        return 1;