From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Tue, 18 Sep 2018 16:12:10 +0000 (+0000)
Subject: Merge pull request #12572 from alalek:ffmpeg_update_master
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~547
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53ad291ef10791f9d65405ef9a08fb2bd525081b;p=platform%2Fupstream%2Fopencv.git

Merge pull request #12572 from alalek:ffmpeg_update_master
---

53ad291ef10791f9d65405ef9a08fb2bd525081b