Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fills frame variable even when not seeking to frame. This fixes bug #6828.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39540 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2010-11-20 16:49:34 +00:00
parent cf85a555b0
commit ebe3c563da
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
View File

@ -580,10 +580,8 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
TRACE_SEEK(" found time: %lld -> %lld (%.2f)\n", *time,
foundTime, foundTime / 1000000.0);
*time = foundTime;
if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) {
*frame = *time * frameRate / 1000000LL + 0.5;
TRACE_SEEK(" seeked frame: %lld\n", *frame);
}
*frame = (uint64)(*time * frameRate / 1000000LL + 0.5);
TRACE_SEEK(" seeked frame: %lld\n", *frame);
} else {
TRACE_SEEK(" _NextPacket() failed!\n");
return B_ERROR;
@ -672,10 +670,8 @@ StreamBase::Seek(uint32 flags, int64* frame, bigtime_t* time)
*time = foundTime;
TRACE_SEEK(" sought time: %.2fs\n", *time / 1000000.0);
if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) {
*frame = *time * frameRate / 1000000.0 + 0.5;
TRACE_SEEK(" sought frame: %lld\n", *frame);
}
*frame = (uint64)(*time * frameRate / 1000000.0 + 0.5);
TRACE_SEEK(" sought frame: %lld\n", *frame);
}
return B_OK;