Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 27 Sep 2014 13:09:24 +0000 (13:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 27 Sep 2014 13:09:24 +0000 (13:09 +0000)

Trivial merge