[FFmpeg-cvslog] Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr  3 20:39:05 2017 +0200| [bc55e8f08bdd8c688908a0c85eea0e29600613f2] | committer: Clément Bœsch

Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'

* commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8':
  hlsenc: Fix the openssl support

This commit is a noop, see edc43c571d66b07315f99d00b5ada667fc77b932

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

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