From 424831f65117223465aec06f928a9ff00d170869 Mon Sep 17 00:00:00 2001 From: arpi Date: Sat, 14 Sep 2002 23:21:22 +0000 Subject: [PATCH] The granule position of pages contining Vorbis audio is in units of PCM audio samples (per channel; a stereo stream's granule position does no increment at twice the speed of a mono stream). patch by Moritz Bunkus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7397 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ogg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 9248095803..08d22b9677 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -529,7 +529,7 @@ int demux_ogg_open(demuxer_t* demuxer) { if(extra_size > 0) memcpy(sh_a->wf+sizeof(WAVEFORMATEX),pack.packet+142,extra_size); - ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate * sh_a->channels; + ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; n_audio++; mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub); if(verbose) print_wave_header(sh_a->wf); @@ -580,7 +580,7 @@ int demux_ogg_open(demuxer_t* demuxer) { if(extra_size) memcpy(sh_a->wf+sizeof(WAVEFORMATEX),st+1,extra_size); - ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate * sh_a->channels; + ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels; n_audio++; mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (new hdr)\n",ogg_d->num_sub); if(verbose) print_wave_header(sh_a->wf);