[FFmpeg-cvslog] Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 16:40:15 2017 +0100| [962e15d0f525557928ec6d42b49d19dd5c4833c5] | committer: Clément Bœsch

Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'

* commit '20b75970e43a030f959b17ff2dfd561174b6f24e':
  file protocol: handle the file: protocol string in file_check

This commit is a noop, see 77015443a84bb5dbed38eafc2ea26a2bf2641ed6

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=962e15d0f525557928ec6d42b49d19dd5c4833c5
---