Merge commit 'c065f4a0'

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

Merge commit 'c065f4a0'
* commit 'c065f4a0': huffyuv: K&R formatting cosmetics Conflicts: libavcodec/huffyuvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
c1e7fb60 · Michael Niedermayer · 2aeeb3ba · c065f4a0 · c1e7fb60
Commit c1e7fb60 authored Aug 04, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 172 additions and 154 deletions

huffyuvdec.c libavcodec/huffyuvdec.c +172 -154

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