[SCM] libav/experimental: Remove ChannelData.lev var and use ChannelData.level instead

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:29:52 UTC 2013


The following commit has been merged in the experimental branch:
commit 710428c4ec5c3b5fe1e417d2280540e90f2ed1f3
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Tue Sep 9 16:50:11 2008 +0000

    Remove ChannelData.lev var and use ChannelData.level instead
    
    Originally committed as revision 15287 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index 8651744..255ba87 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -141,7 +141,7 @@ static const int16_t MACEtab4[][2] = {
 #define QT_8S_2_16S(x) (((x) & 0xFF00) | (((x) >> 8) & 0xFF))
 
 typedef struct ChannelData {
-    int16_t index, lev, factor, prev2, previous, level;
+    int16_t index, factor, prev2, previous, level;
 } ChannelData;
 
 typedef struct MACEContext {
@@ -174,9 +174,9 @@ static void chomp3(ChannelData *chd, int16_t *output, uint8_t val,
     else
         current = - 1 - tab2[((chd->index & 0x7f0) >> 4)*tab2_stride + 2*tab2_stride-val-1];
 
-    current = mace_broken_clip_int16(current + chd->lev);
+    current = mace_broken_clip_int16(current + chd->level);
 
-    chd->lev = current - (current >> 3);
+    chd->level = current - (current >> 3);
     *output = QT_8S_2_16S(current);
     if (( chd->index += tab1[val]-(chd->index >> 5) ) < 0)
         chd->index = 0;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list