Merge pull request #13034 from alalek:ffmpeg_update_3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Nov 2018 20:52:49 +0000 (23:52 +0300)
committerGitHub <noreply@github.com>
Tue, 6 Nov 2018 20:52:49 +0000 (23:52 +0300)

Trivial merge