Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv13619 Modified Files: demux_ogg.c Log Message: 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 <moritz@bunkus.org> Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- demux_ogg.c 28 Aug 2002 17:07:55 -0000 1.12 +++ demux_ogg.c 14 Sep 2002 23:21:22 -0000 1.13 @@ -529,7 +529,7 @@ 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 @@ 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);