Merge pull request #11640 from alalek:backport_11617

modules/highgui/src/cap_ffmpeg_impl.hpp

@@ -1496,6 +1496,9 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
 #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(52, 42, 0)
     st->avg_frame_rate = (AVRational){frame_rate, frame_rate_base};
 #endif
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 20, 0)
+    st->time_base = c->time_base;
+#endif
 
     return st;
 }

modules/highgui/test/test_ffmpeg.cpp

@@ -320,6 +320,7 @@ public:
 
             for (unsigned int i = 0; i < frameCount && next; ++i)
             {
+                SCOPED_TRACE(cv::format("frame=%d", (int)i));
                 Mat actual;
                 (*capture) >> actual;