X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fffmpeg.C;h=4b585eaa531faed284d8740b781273ae28d0751e;hb=9d843688067273fd869c55a418962c64814b12ae;hp=a6bbabc15d0ec5bf3019cfd518e8b576c005fd94;hpb=0c4a2f8b1eeef69a9fb35868e36c8772141e3c4b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/ffmpeg.C b/cinelerra-5.0/cinelerra/ffmpeg.C index a6bbabc1..4b585eaa 100644 --- a/cinelerra-5.0/cinelerra/ffmpeg.C +++ b/cinelerra-5.0/cinelerra/ffmpeg.C @@ -1887,7 +1887,6 @@ int FFMPEG::audio_seek(int stream, int64_t pos) { int aidx = astrm_index[stream].st_idx; FFAudioStream *aud = ffaudio[aidx]; - pos = pos * aud->sample_rate / file_base->asset->sample_rate + 0.5; aud->audio_seek(pos); return 0; } @@ -1896,7 +1895,6 @@ int FFMPEG::video_seek(int stream, int64_t pos) { int vidx = vstrm_index[stream].st_idx; FFVideoStream *vid = ffvideo[vidx]; - pos = pos * vid->frame_rate / file_base->asset->frame_rate + 0.5; vid->video_seek(pos); return 0; } @@ -1907,7 +1905,6 @@ int FFMPEG::decode(int chn, int64_t pos, double *samples, int len) if( !has_audio || chn >= astrm_index.size() ) return -1; int aidx = astrm_index[chn].st_idx; FFAudioStream *aud = ffaudio[aidx]; - pos = pos * aud->sample_rate / file_base->asset->sample_rate + 0.5; if( aud->load(pos, len) < len ) return -1; int ch = astrm_index[chn].st_ch; int ret = aud->read(samples,len,ch); @@ -1919,7 +1916,6 @@ int FFMPEG::decode(int layer, int64_t pos, VFrame *vframe) if( !has_video || layer >= vstrm_index.size() ) return -1; int vidx = vstrm_index[layer].st_idx; FFVideoStream *vid = ffvideo[vidx]; - pos = pos * vid->frame_rate / file_base->asset->frame_rate + 0.5; return vid->load(vframe, pos); }