[SCM] libav/experimental: matroskadec: simplify matroska_ebmlnum_sint()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:26:55 UTC 2013


The following commit has been merged in the experimental branch:
commit 33ac07ea08f47beebf51e43a4a2bc7fe81a9ad90
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Tue Aug 5 00:42:55 2008 +0000

    matroskadec: simplify matroska_ebmlnum_sint()
    
    Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 338f698..1d9f58d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -660,10 +660,7 @@ static int matroska_ebmlnum_sint(MatroskaDemuxContext *matroska,
         return res;
 
     /* make signed (weird way) */
-    if (unum == (uint64_t)-1)
-        *num = INT64_MAX;
-    else
-        *num = unum - ((1LL << ((7 * res) - 1)) - 1);
+    *num = unum - ((1LL << (7*res - 1)) - 1);
 
     return res;
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list