Merge pull request #11617 from alalek:ffmpeg_fix_time_base

This commit is contained in:
Alexander Alekhin
2018-05-29 15:19:13 +00:00
2 changed files with 5 additions and 0 deletions
+3
View File
@@ -1587,6 +1587,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;
}
+2
View File
@@ -357,6 +357,8 @@ public:
for (unsigned int i = 0; i < frameCount && next; ++i)
{
SCOPED_TRACE(cv::format("frame=%d", (int)frameCount));
Mat actual;
(*capture) >> actual;