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