From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Tue, 19 Nov 2019 18:45:39 +0000 (+0000)
Subject: Merge pull request #15939 from alalek:ffmpeg_update_3.4
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~51^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d14c0b37a464529d6576e081d59ad358152d2ad;p=platform%2Fupstream%2Fopencv.git

Merge pull request #15939 from alalek:ffmpeg_update_3.4
---

9d14c0b37a464529d6576e081d59ad358152d2ad