git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1e0113
)
matroskadec: simplify matroska_ebmlnum_sint()
author
Aurelien Jacobs
<aurel@gnuage.org>
Tue, 5 Aug 2008 00:42:55 +0000
(
00:42
+0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Tue, 5 Aug 2008 00:42:55 +0000
(
00:42
+0000)
Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
338f698
..
1d9f58d
100644
(file)
--- 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;
}