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