From 998c43ffea70b4ee46d8ec7233e044be6bbb847d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 14 Jul 2016 14:50:04 +0300 Subject: [PATCH] videoio: ffmpeg: fix get_fps() implementation --- modules/videoio/src/cap_ffmpeg_impl.hpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index 4a725bc20b..a0b9d402f6 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -1135,11 +1135,7 @@ int CvCapture_FFMPEG::get_bitrate() const double CvCapture_FFMPEG::get_fps() const { -#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0) - double fps = r2d(ic->streams[video_stream]->avg_frame_rate); -#else double fps = r2d(ic->streams[video_stream]->r_frame_rate); -#endif #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0) if (fps < eps_zero)