Merge pull request #4143 from Dikay900:ffmpeg_dict
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 20 Jun 2015 14:19:51 +0000 (14:19 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Sat, 20 Jun 2015 14:19:51 +0000 (14:19 +0000)

Trivial merge