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)
* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4':
  libopenh264enc: Fix inconsistent whitespace

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

Simple merge