sync with upstreamHEADmaster

1 files changed, 29 insertions, 18 deletions

diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
index f8ceab2..6da4838 100644
--- a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
@@ -9,32 +9,43 @@
 #pragma once
 
 #include "TimingConstants.h"
+
 #include <cstdint>
 #include <memory>
 
 #define DMX_SPECIALID_STREAMINFO    -10
 #define DMX_SPECIALID_STREAMCHANGE  -11
 
-struct DemuxCryptoInfo;
-
-typedef struct DemuxPacket
+#ifdef __cplusplus
+extern "C"
 {
-  DemuxPacket() = default;
+#endif /* __cplusplus */
+
+  struct DemuxCryptoInfo;
+
+  typedef struct DemuxPacket
+  {
+    DemuxPacket() = default;
+
+    uint8_t* pData = nullptr;
+    int iSize = 0;
+    int iStreamId = -1;
+    int64_t demuxerId = -1; // id of the demuxer that created the packet
+    int iGroupId =
+        -1; // the group this data belongs to, used to group data from different streams together
 
-  uint8_t *pData = nullptr;
-  int iSize = 0;
-  int iStreamId = -1;
-  int64_t demuxerId = -1; // id of the demuxer that created the packet
-  int iGroupId = -1; // the group this data belongs to, used to group data from different streams together
+    void* pSideData = nullptr;
+    int iSideDataElems = 0;
 
-  void *pSideData = nullptr;
-  int iSideDataElems = 0;
+    double pts = DVD_NOPTS_VALUE;
+    double dts = DVD_NOPTS_VALUE;
+    double duration = 0; // duration in DVD_TIME_BASE if available
+    int dispTime = 0;
+    bool recoveryPoint = false;
 
-  double pts = DVD_NOPTS_VALUE;
-  double dts = DVD_NOPTS_VALUE;
-  double duration = 0; // duration in DVD_TIME_BASE if available
-  int dispTime = 0;
-  bool recoveryPoint = false;
+    std::shared_ptr<DemuxCryptoInfo> cryptoInfo;
+  } DemuxPacket;
 
-  std::shared_ptr<DemuxCryptoInfo> cryptoInfo;
-} DemuxPacket;
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */