[SCM] libav/wheezy-security: elbg: Fix an assert

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Oct 19 20:18:10 UTC 2014


The following commit has been merged in the wheezy-security branch:
commit 9858a723cbcb206287fd0232d74c6a0991eecdc8
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Aug 18 21:53:32 2012 +0200

    elbg: Fix an assert
    
    It seems the condition was flipped from what was intended.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>
    (cherry picked from commit 2c340596cab981ac842aff7da89d298025c99304)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c
index 030c3a6..36ed9c2 100644
--- a/libavcodec/elbg.c
+++ b/libavcodec/elbg.c
@@ -110,7 +110,7 @@ static int get_high_utility_cell(elbg_data *elbg)
     while (elbg->utility_inc[i] < r)
         i++;
 
-    assert(!elbg->cells[i]);
+    assert(elbg->cells[i]);
 
     return i;
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list