Merge commit 'a36947c1'

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

Merge commit 'a36947c1'
* commit 'a36947c1': dsputilenc_mmx: K&R formatting cosmetics Conflicts: libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b7a5f5dc · Michael Niedermayer · d926c4b2 · a36947c1 · b7a5f5dc
Commit b7a5f5dc authored Mar 14, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 770 additions and 727 deletions

dsputilenc_mmx.c libavcodec/x86/dsputilenc_mmx.c +770 -727

No files found.
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c