aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/file-mp4.c
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2014-07-24 21:44:58 +0200
committerMartin Kaiser <wireshark@kaiser.cx>2014-07-24 20:01:47 +0000
commitcca0fd35fe7c0b5fa660d1a7c8a93ae11376d6b3 (patch)
tree2076acd9e90201b4925ae9f898914498cec6e5ab /epan/dissectors/file-mp4.c
parent0b15ec8cdce610efa0b1c5f1d7c4cc7c4ab21f05 (diff)
add the flags to all FullBoxes
Change-Id: I6e0109bc1d1acf200fd0c1a9f8ddd3a3d98f5908 Reviewed-on: https://code.wireshark.org/review/3189 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/file-mp4.c')
-rw-r--r--epan/dissectors/file-mp4.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index 8efa5a93aa..911b94f00c 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -174,6 +174,8 @@ dissect_mp4_mvhd_body(tvbuff_t *tvb, gint offset, gint len _U_,
proto_tree_add_item(tree, hf_mp4_full_box_ver,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
return offset-offset_start;
@@ -189,6 +191,8 @@ dissect_mp4_mfhd_body(tvbuff_t *tvb, gint offset, gint len _U_,
proto_tree_add_item(tree, hf_mp4_full_box_ver,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
proto_tree_add_item(tree, hf_mp4_mfhd_seq_num,
@@ -215,8 +219,8 @@ dissect_mp4_tkhd_body(tvbuff_t *tvb, gint offset, gint len _U_,
proto_tree_add_item(tree, hf_mp4_full_box_ver,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- /* XXX dissect the flags */
- proto_tree_add_text(tree, tvb, offset, 3, "Flags");
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
time_len = (version==0) ? 4 : 8;
@@ -299,7 +303,9 @@ dissect_mp4_hdlr_body(tvbuff_t *tvb, gint offset, gint len _U_,
tvb, offset, 1, ENC_BIG_ENDIAN);
/* XXX - put up an expert info if version!=0 */
offset += 1;
- offset += 3; /* flags in the full box header */
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
+ offset += 3;
offset += 4; /* four reserved 0 bytes */
@@ -333,7 +339,9 @@ dissect_mp4_dref_body(tvbuff_t *tvb, gint offset, gint len _U_,
tvb, offset, 1, ENC_BIG_ENDIAN);
/* XXX - put up an expert info if version!=0 */
offset += 1;
- offset += 3; /* flags in the full box header */
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
+ offset += 3;
entry_cnt = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(tree, hf_mp4_dref_entry_cnt,
@@ -391,7 +399,9 @@ dissect_mp4_stsd_body(tvbuff_t *tvb, gint offset, gint len,
tvb, offset, 1, ENC_BIG_ENDIAN);
/* XXX - put up an expert info if version!=0 */
offset += 1;
- offset += 3; /* flags in the full box header */
+ proto_tree_add_item(tree, hf_mp4_full_box_flags,
+ tvb, offset, 3, ENC_BIG_ENDIAN);
+ offset += 3;
entry_cnt = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(tree, hf_mp4_dref_entry_cnt,