Merge remote-tracking branch 'qatar/master'

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

Merge remote-tracking branch 'qatar/master'
* qatar/master: vc1dsp: K&R formatting cosmetics Conflicts: libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4daf8bc3 · Michael Niedermayer · 6bd001d7 · a1f51648 · 4daf8bc3
Commit 4daf8bc3 authored Jan 12, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 403 additions and 321 deletions

vc1dsp.c libavcodec/vc1dsp.c +403 -321

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