Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:26:00 +0000 (10:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:26:00 +0000 (10:26 +0100)
commit70737b83f06e34a8b4f9eb70948b2f2ca6711992
tree918a1ec45b3a8622b4c732ddc5db7451849fd509
parent558784f113f1436a48f34db2612c3b6460e6c734
parentd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68
Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'

* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
libavformat/oggparsetheora.c

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