Merge pull request #6905 from alalek:ffmpeg_fix_get_fps

0e6aa189 · Alexander Alekhin · 91d80d03 · 998c43ff · 0e6aa189
Commit 0e6aa189 authored Jul 15, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

cap_ffmpeg_impl.hpp modules/videoio/src/cap_ffmpeg_impl.hpp +0 -4

No files found.
--- 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)