diff options
| author | Evan Huus <eapache@gmail.com> | 2014-09-09 00:00:10 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-09-09 00:00:18 +0000 |
| commit | a23bbaf268a32358b473c9ecfca9bc4d24fd2253 (patch) | |
| tree | d1a66cfc1d7c8b18cc7a0d7098db0cdad3c74e52 /epan/dissectors/packet-mp2t.c | |
| parent | f9bfa976e67da2f8065f172de9ed06fad61762a8 (diff) | |
Revert "Explicitly lengthen some constants to 64 bits"
Guy already fixed the issue, I was looking at a stale buildbot page.
This reverts commit f9bfa976e67da2f8065f172de9ed06fad61762a8.
Change-Id: I04e2f1ddfae9558b6cec40740ffbb66a16c3fecb
Reviewed-on: https://code.wireshark.org/review/4046
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mp2t.c')
| -rw-r--r-- | epan/dissectors/packet-mp2t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 3ea7c0b470..f1d83795a9 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -976,7 +976,7 @@ dissect_mp2t_adaptation_field(tvbuff_t *tvb, gint offset, proto_tree *tree) /* 33 bit PCR base, 6 bit reserved, 9 bit PCR ext */ pcr_base = tvb_get_ntoh48(tvb, offset) >> (48-33); - pcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & G_GUINT64_CONSTANT(0x1FF)); + pcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_pcr, tvb, offset, 6, pcr_base*300 + pcr_ext); @@ -990,7 +990,7 @@ dissect_mp2t_adaptation_field(tvbuff_t *tvb, gint offset, proto_tree *tree) /* the same format as PCR above */ opcr_base = tvb_get_ntoh48(tvb, offset) >> (48-33); - opcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & G_GUINT64_CONSTANT(0x1FF)); + opcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_opcr, tvb, offset, 6, opcr_base*300 + opcr_ext); |