generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged the trunk r8887, r8891, r8314

Browse Source
This commit is contained in:
Andrey Kamaev
2012-07-02 12:33:37 +00:00
parent 5a7804d958
commit d4df1e0b5c
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@@ -669,7 +669,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
// if we have not grabbed a single frame before first seek, let's read the first frame
// and get some valuable information during the process
if( first_frame_number < 0 )
if( first_frame_number < 0 && get_total_frames() > 1 )
grabFrame();
for(;;)
@@ -679,7 +679,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number)
int64_t time_stamp = ic->streams[video_stream]->start_time;
double time_base = r2d(ic->streams[video_stream]->time_base);
time_stamp += (int64_t)(sec / time_base + 0.5);
av_seek_frame(ic, video_stream, time_stamp, AVSEEK_FLAG_BACKWARD);
if (get_total_frames() > 1) av_seek_frame(ic, video_stream, time_stamp, AVSEEK_FLAG_BACKWARD);
avcodec_flush_buffers(ic->streams[video_stream]->codec);
if( _frame_number > 0 )
{