Merge commit 'fcae3ff1'

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

Merge commit 'fcae3ff1'
* commit 'fcae3ff1': dsicinav: K&R formatting cosmetics Conflicts: libavcodec/dsicinav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
75fbe41f · Michael Niedermayer · 1f7acf3c · fcae3ff1 · 75fbe41f
Commit 75fbe41f authored Jul 21, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 59 additions and 49 deletions

dsicinav.c libavcodec/dsicinav.c +59 -49

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