diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-02 17:44:16 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-02 17:44:16 +0000 |
| commit | 26398539cbd1e5225f41003b58128c132b4aebdf (patch) | |
| tree | 254a8c2d2d012d8b466ad67669c17fb0411c799e /mencoder.c | |
| parent | 222a22353d0fe84f1e4fe3aeae36d66870e42606 (diff) | |
| download | mpv-26398539cbd1e5225f41003b58128c132b4aebdf.tar.bz2 mpv-26398539cbd1e5225f41003b58128c132b4aebdf.tar.xz | |
count blocks by rounded-up chunksizes instead of chunks -
we need full emulation of dshow avi demuxer bugs :(
fixes silly nandub-style a-v delaying in avi with vbr mp3...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6872 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index e5fc363dad..fb0f29e5f4 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1071,7 +1071,7 @@ if(sh_audio && !demuxer2){ if(pts_from_bps){ unsigned int samples=(sh_audio->audio.dwSampleSize)? ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : - (d_audio->pack_no); // <- used for VBR audio + (d_audio->block_no); // <- used for VBR audio // printf("samples=%d \n",samples); a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; delay_corrected=1; @@ -1119,7 +1119,7 @@ if(sh_audio && !demuxer2){ float len=(demuxer->movi_end-demuxer->movi_start); float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : 0; if(!len && sh_audio && sh_audio->audio.dwLength>100){ - p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->pack_no) + p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no) / (float)(sh_audio->audio.dwLength); } #if 0 |