Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 17:58:57 +0000 (19:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 17:58:57 +0000 (19:58 +0200)
commit8365287e613d82e8fc1e842878cbbe285c1d592d
treed5574957cc893aa84f5f3e5863a1eaa4336fb802
parent06e5d28e33e9e3b9e38ff958f29bba925e44d573
parentf1f6156b3fc9eb77b439d031ba18974d80b8341e
Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c