Merge commit '1c88617b'
* commit '1c88617b': riff: K&R formatting cosmetics Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment
* commit '1c88617b': riff: K&R formatting cosmetics Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>