aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-01 01:33:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-01 01:33:49 +0000
commit89ef2c29a082a71d5c44809fd5dafd2b272e18a7 (patch)
tree8a3e8af28423b38d41241040e6484902fbb59d80 /libavutil
parent070144671decc8be54e981ca8157694b41d1dcc3 (diff)
downloadffmpeg-89ef2c29a082a71d5c44809fd5dafd2b272e18a7.tar.gz
Merge declaration and initialization.
Originally committed as revision 11701 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/common.h8
1 files 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;