Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:23:49 +0000 (13:23 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:23:49 +0000 (13:23 +0200)
commitedb4c445119501070cb00be1696d47c6d6462e2a
tree940d79e03eb4d23786b90bf5e539192fa7b818ba
parent2335e189fb7bcbee2eac6ec9a5756c29f6782a5b
parent31aa5335c390c83a6c3ea955b155067c36c4a2c4
Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'

* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4':
  libopenh264enc: Fix inconsistent whitespace

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libopenh264enc.c