Merge commit 'bb12c2e9'
* commit 'bb12c2e9': dsputil: K&R formatting cosmetics Conflicts: libavcodec/dsputil.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