From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Fri, 7 Oct 2016 11:23:49 +0000 (+0200)
Subject: Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=edb4c445119501070cb00be1696d47c6d6462e2a;p=ffmpeg

Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

edb4c445119501070cb00be1696d47c6d6462e2a