-
Michael Niedermayer authored
* commit '86a36108': lmlm4: K&R formatting cosmetics Conflicts: libavformat/lmlm4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
59f49667
* commit '86a36108': lmlm4: K&R formatting cosmetics Conflicts: libavformat/lmlm4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>