OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee161da 3c7fa8c)
Merge commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'
authorClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)
* commit '3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8':
  hlsenc: Fix the openssl support

This commit is a noop, see edc43c571d66b07315f99d00b5ada667fc77b932

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

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help