aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mpeg-pes.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:36:13 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-09 07:36:13 +0000
commitb2e9a22ec53becba2c23777ffee4ff375d135698 (patch)
tree794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-mpeg-pes.c
parentd629eac134867d997a496115fd1a04090f149fe7 (diff)
Don't guard col_clear with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mpeg-pes.c')
-rw-r--r--epan/dissectors/packet-mpeg-pes.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 8e95b36ee9..13ac0ea68e 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -752,8 +752,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (prefix != PES_PREFIX)
return FALSE;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_clear(pinfo->cinfo, COL_INFO);
stream = tvb_get_guint8(tvb, 3);
if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -907,8 +906,7 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_clear(pinfo->cinfo, COL_INFO);
if (tree)
proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE);
}