Merge remote-tracking branch 'qatar/master'

* qatar/master: golomb: K&R formatting cosmetics Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'
* qatar/master: golomb: K&R formatting cosmetics Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
02a31f6a · Michael Niedermayer · 4c18c314 · 2c993e8b · 02a31f6a
Commit 02a31f6a authored Oct 23, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 177 additions and 135 deletions

golomb.h libavcodec/golomb.h +177 -135

No files found.
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h