osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

PMT, DVB-CI: remove packet-mpeg-pmt.h 

packet-mpeg-pmt.h is included only by DVB-CI. All it contains is
the definition of a value string for stream types in the ca_pmt.
Move the definition into packet-dvbci.c and remove the include file.

Change-Id: I7d63e49804c936284f6a9c5218e0fd9b4fa469a6
Reviewed-on: https://code.wireshark.org/review/29813
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Martin Kaiser 2018-09-24 21:19:35 +02:00 committed by Anders Broman
parent 66352b5e3c
commit 1b0167427a
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/CMakeLists.txt
View File

@ -429,7 +429,6 @@ set(DISSECTOR_PUBLIC_HEADERS
packet-mount.h
packet-mp4ves.h
packet-mpeg-descriptor.h
packet-mpeg-pmt.h
packet-mpeg-sect.h
packet-mpls.h
packet-mq.h

2
epan/dissectors/packet-dvbci.c
View File

@ -32,7 +32,6 @@
#include "packet-dvbci.h"
#include "packet-mpeg-descriptor.h"
#include "packet-mpeg-sect.h"
#include "packet-mpeg-pmt.h"
#include "packet-x509af.h"
#include "packet-x509ce.h"
#include "packet-ber.h"
@ -1640,6 +1639,7 @@ static const value_string dvbci_sas_sess_state[] = {
{ 0, NULL }
};
extern value_string_ext mpeg_pmt_stream_type_vals_ext;
static guint16 buf_size_cam; /* buffer size proposal by the CAM */
/* buffer size proposal by the host == negotiated buffer size */

17
epan/dissectors/packet-mpeg-pmt.h
View File

@ -1,17 +0,0 @@
/* packet-mpeg-pmt.h
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef __PACKET_MPEG_PMT_H__
#define __PACKET_MPEG_PMT_H__
#include <epan/value_string.h>
extern value_string_ext mpeg_pmt_stream_type_vals_ext;
#endif