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)
commite75576e1ab3d7021177037adc7c80b1496d435b0
treef8921ec59c7238386f6d370c9ceb22e7d74dade7
parentd9be552bbc52cb1056ea6fb038da1b68515317a4
parent2007e1d8a3d670153a94409b19588a5db12f1591
Merge pull request #13034 from alalek:ffmpeg_update_3.4