Merge commit '0f689a3d'

* commit '0f689a3d': wavpack: K&R formatting cosmetics Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0f689a3d'
* commit '0f689a3d': wavpack: K&R formatting cosmetics Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
02788d2a · Michael Niedermayer · df07a833 · 0f689a3d · 02788d2a
Commit 02788d2a authored May 19, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 159 additions and 126 deletions

wavpack.c libavcodec/wavpack.c +159 -126

No files found.
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c