Merge commit '84cfce9f'
* commit '84cfce9f': matroskadec: K&R formatting cosmetics Conflicts: libavformat/matroskadec.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