Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:10:00 +0000 (10:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:10:00 +0000 (10:10 +0200)
commit02788d2ac5dfffd0ce862adea953e73466ee7018
treebe5f915d2177f27fd16eff4b4f6d4ed2bbb74091
parentdf07a833f1d11639cff562a8404d2bbc3c48c2ce
parent0f689a3d97a1d3053ca0e9516b296909a72ff31e
Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'

* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
  wavpack: K&R formatting cosmetics

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wavpack.c