Browse Source

Merge declaration and initialization.

Originally committed as revision 11701 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 18 years ago
parent
commit
89ef2c29a0
1 changed files with 2 additions and 6 deletions
  1. +2
    -6
      libavutil/common.h

+ 2
- 6
libavutil/common.h View File

@@ -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;


Loading…
Cancel
Save