[SCM] libav/experimental: Merge declaration and initialization.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 89ef2c29a082a71d5c44809fd5dafd2b272e18a7
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Feb 1 01:33:49 2008 +0000

    Merge declaration and initialization.
    
    Originally committed as revision 11701 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/common.h b/libavutil/common.h
index f2dd83b..c6356a8 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -96,9 +96,7 @@ extern const uint8_t ff_log2_tab[256];
 
 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(unsigned int v)
 
 static inline int av_log2_16bit(unsigned int v)
 {
-    int n;
-
-    n = 0;
+    int n = 0;
     if (v & 0xff00) {
         v >>= 8;
         n += 8;

-- 
Libav/FFmpeg packaging