-
Michael Niedermayer authored
* commit '037fea38': flashsv: K&R formatting cosmetics Conflicts: libavcodec/flashsv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
0b82fdcc
* commit '037fea38': flashsv: K&R formatting cosmetics Conflicts: libavcodec/flashsv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>