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