-
Michael Niedermayer authored
* commit '72e228b2': nut: K&R formatting cosmetics Conflicts: libavformat/nut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
057c5d2e
* commit '72e228b2': nut: K&R formatting cosmetics Conflicts: libavformat/nut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>