Merge pull request #23692 from asmorkalov:as/ffmpeg_fps_3.4

backport to 3.4: Fixed FPS computation on some videos for FFmpeg backend
2 years ago · d1b158b9dd
parent 749935866d cbda161c39
commit d1b158b9dd
1 changed files with 1 additions and 1 deletions
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@ -1537,7 +1537,7 @@ int64_t CvCapture_FFMPEG::get_bitrate() const

 double CvCapture_FFMPEG::get_fps() const
 {
-#if 0 && LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 1, 100) && LIBAVFORMAT_VERSION_MICRO >= 100
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 1, 100) && LIBAVFORMAT_VERSION_MICRO >= 100
    double fps = r2d(av_guess_frame_rate(ic, ic->streams[video_stream], NULL));
 #else
 #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0)