From 4ec74414bb859f5c02267390df32fbf93d503af5 Mon Sep 17 00:00:00 2001 From: Alexander Reshetnikov Date: Tue, 17 Apr 2012 17:18:35 +0000 Subject: [PATCH] Fixed error in frame positioning (bug #1815) --- modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index e89af78806..ca9fd25e6e 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -723,9 +723,9 @@ double CvCapture_FFMPEG::dts_to_sec(int64_t dts) return static_cast(dts - ic->streams[video_stream]->start_time) * r2d(ic->streams[video_stream]->time_base); } -void CvCapture_FFMPEG::seek(int64_t frame_number) +void CvCapture_FFMPEG::seek(int64_t _frame_number) { - frame_number = std::min(frame_number, get_total_frames()); + frame_number = std::min(_frame_number, get_total_frames()); int64_t dts = dts_to_frame_number(ic->streams[video_stream]->cur_dts); if (abs(dts - 2 - frame_number) > 16)