Michael Niedermayer 75a9859ac6 Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b' ...

* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
  wma: K&R formatting cosmetics

Conflicts:
	libavcodec/wma.c
	libavcodec/wmadec.c
	libavcodec/wmaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-09-03 22:10:21 +02:00

34 KiB

Raw Blame History

View Raw