[opencv] 22/89: ffmpeg: backport 7213

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit 64a2d1904b80faf71a322f934be885bee8ecac4a
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Fri Nov 11 16:27:22 2016 +0300

    ffmpeg: backport 7213
    
    Commit:
      6d54abbd0fc64b23ea0b97f3c906cba219b52dc8
---
 modules/highgui/src/cap_ffmpeg_impl.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index da05bde..a934faa 100644
--- 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;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git