# HG changeset patch # User michael # Date 1201829629 0 # Node ID 864980df138516b016c8af023be6cb848432c9c9 # Parent 12f0072323ce723bdd0738f7754fbc07e3ac6a61 Merge declaration and initialization. diff -r 12f0072323ce -r 864980df1385 common.h --- a/common.h Fri Feb 01 01:33:16 2008 +0000 +++ b/common.h Fri Feb 01 01:33:49 2008 +0000 @@ -96,9 +96,7 @@ static inline int av_log2(unsigned int v) { - int n; - - n = 0; + int n = 0; if (v & 0xffff0000) { v >>= 16; n += 16; @@ -114,9 +112,7 @@ static inline int av_log2_16bit(unsigned int v) { - int n; - - n = 0; + int n = 0; if (v & 0xff00) { v >>= 8; n += 8;