Merge commit '50ecf157'
* commit '50ecf157': avformat: utils: K&R formatting cosmetics Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment