-
Michael Niedermayer authored
* commit '13f57a4d': wav: K&R formatting cosmetics Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
482c1ac8
* commit '13f57a4d': wav: K&R formatting cosmetics Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>