mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-02 03:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
backport to 3.4: Fixed FPS computation on some videos for FFmpeg backend
This commit is contained in:
Alexander Smorkalov 2023-05-26 20:47:13 +03:00 committed by GitHub
commit d1b158b9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -1537,7 +1537,7 @@ int64_t CvCapture_FFMPEG::get_bitrate() const
double CvCapture_FFMPEG::get_fps() 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)); double fps = r2d(av_guess_frame_rate(ic, ic->streams[video_stream], NULL));
#else #else
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0) #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0)