Merge pull request #7655 from alalek:backport_7213

8f4251fb · Alexander Alekhin · f632f5c5 · 64a2d190 · 8f4251fb
Commit 8f4251fb authored Nov 14, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -1482,6 +1482,10 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
    }
 #endif

+#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(52, 42, 0)
+    st->avg_frame_rate = (AVRational){frame_rate, frame_rate_base};
+#endif
+
    return st;
 }