summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:42:55 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:42:55 +0000
commit33ac07ea08f47beebf51e43a4a2bc7fe81a9ad90 (patch)
tree216da74849b7d704aadc5018664faf5c23adae5d
parentc1e01133f6c2c0533513b1dc07b00ad63125a3bb (diff)
matroskadec: simplify matroska_ebmlnum_sint()
Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroskadec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 338f69868e..1d9f58dbb2 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;
}