]> git.sesse.net Git - ffmpeg/commit
Merge commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:10:15 +0000 (13:10 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:10:15 +0000 (13:10 +0100)
commit65cb02301acc90b68e647761cd3658195b6213b8
tree68848aa57adc87a3328fa914b414d4e7fbe78d15
parentd1ab8c66cf4745abe11f59236f8dc1308826bf95
parentf22363c72968f1a1fc4881d8695ec7068b0aa03c
Merge commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c'

* commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c':
  openssl: Avoid double semicolons after the GET_BIO_DATA macro

This commit is a noop, see fc83de7e1d0eab29942b4ceb67b49e66e7b99226

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