-
Michael Niedermayer authored
* commit '49fe9c05': oggparsevorbis: K&R formatting cosmetics Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
f3968ab4
* commit '49fe9c05': oggparsevorbis: K&R formatting cosmetics Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>