From 89ef2c29a082a71d5c44809fd5dafd2b272e18a7 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 1 Feb 2008 01:33:49 +0000
Subject: [PATCH] Merge declaration and initialization.

Originally committed as revision 11701 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavutil/common.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index f2dd83b323..c6356a857f 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;