]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9'
authorClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:00:50 +0000 (23:00 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:00:50 +0000 (23:00 +0100)
* commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9':
  Fix instances of broken indentation found by gcc 6

Noop, see 21d3f0c026089c44a2

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

Trivial merge