Merge pull request opencv#7655 from alalek:backport_7213

alalek · alalek · commit 8f4251fbfab1 · 2016-11-14T13:42:31.000Z
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1482,6 +1482,10 @@ static AVStream icv_add_video_stream_FFMPEG(AVFormatContext oc,`
`1482`	`1482`	`}`
`1483`	`1483`	`#endif`
`1484`	`1484`
	`1485`	`+#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(52, 42, 0)`
	`1486`	`+ st->avg_frame_rate = (AVRational){frame_rate, frame_rate_base};`
	`1487`	`+#endif`
	`1488`	`+`
`1485`	`1489`	`return st;`
`1486`	`1490`	`}`
`1487`	`1491`