diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-18 22:53:29 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-18 22:53:29 +0000 |
| commit | f16a6fa764effb536ab28766fb686474577cc045 (patch) | |
| tree | 301816bfffe2f380c36894778809786f70c9d45c | |
| parent | d209b3de10cc690ddccd24eb03a63485b7db2c5a (diff) | |
gst/matroska/matroska-demux.c: That was very stupid.
Original commit message from CVS:
* gst/matroska/matroska-demux.c: (gst_matroska_ebmlnum_sint):
That was very stupid.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gst/matroska/matroska-demux.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2004-12-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * gst/matroska/matroska-demux.c: (gst_matroska_ebmlnum_sint): + That was very stupid. + +2004-12-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * gst/matroska/matroska-demux.c: (gst_matroska_demux_parse_blockgroup): Fix possible crasher. diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index e4353c4a..23d099d9 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1732,12 +1732,10 @@ gst_matroska_ebmlnum_sint (guint8 * data, guint size, gint64 * num) return -1; /* make signed */ - if (unum == G_MAXUINT64 && res > 1) + if (unum == G_MAXUINT64) *num = G_MAXINT64; - else if (unum != 0) - *num = unum - ((1 << ((7 * res) - 1)) - 1); else - *num = 0; + *num = unum - ((1 << ((7 * res) - 1)) - 1); return res; } |