From 5196f241385f6b0a0b04794ac0048059d34ecdd8 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Date: Mon, 26 May 2014 18:29:21 +0200
Subject: [PATCH] codecparsers: add C++ guards for MPEG-4 and VP8 parsers.

Fix MPEG-4 and VP8 APIs to export their external symbols as pure C
symbols, i.e. un-mangled for C++.

https://bugzilla.gnome.org/show_bug.cgi?id=731522

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
---
 gst-libs/gst/codecparsers/gstmpeg4parser.c | 1 +
 gst-libs/gst/codecparsers/gstmpeg4parser.h | 5 ++++-
 gst-libs/gst/codecparsers/gstvp8parser.h   | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gst-libs/gst/codecparsers/gstmpeg4parser.c b/gst-libs/gst/codecparsers/gstmpeg4parser.c
index 5acc417..4bf63e5 100644
--- a/gst-libs/gst/codecparsers/gstmpeg4parser.c
+++ b/gst-libs/gst/codecparsers/gstmpeg4parser.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <string.h>
+#include <gst/base/gstbitreader.h>
 #include <gst/base/gstbytereader.h>
 
 
diff --git a/gst-libs/gst/codecparsers/gstmpeg4parser.h b/gst-libs/gst/codecparsers/gstmpeg4parser.h
index 4a726e2..c9030b8 100644
--- a/gst-libs/gst/codecparsers/gstmpeg4parser.h
+++ b/gst-libs/gst/codecparsers/gstmpeg4parser.h
@@ -22,7 +22,8 @@
 #define __GST_MPEG4UTIL_H__
 
 #include <gst/gst.h>
-#include <gst/base/gstbitreader.h>
+
+G_BEGIN_DECLS
 
 typedef struct _GstMpeg4VisualObjectSequence    GstMpeg4VisualObjectSequence;
 typedef struct _GstMpeg4VisualObject            GstMpeg4VisualObject;
@@ -577,4 +578,6 @@ gst_mpeg4_parse_video_packet_header      (GstMpeg4VideoPacketHdr * videopackethd
                                           GstMpeg4SpriteTrajectory * sprite_trajectory,
                                           const guint8 * data, gsize size);
 
+G_END_DECLS
+
 #endif /* __GST_MPEG4UTIL_H__ */
diff --git a/gst-libs/gst/codecparsers/gstvp8parser.h b/gst-libs/gst/codecparsers/gstvp8parser.h
index 228c254..efe7950 100644
--- a/gst-libs/gst/codecparsers/gstvp8parser.h
+++ b/gst-libs/gst/codecparsers/gstvp8parser.h
@@ -26,6 +26,8 @@
 
 #include <gst/gst.h>
 
+G_BEGIN_DECLS
+
 typedef struct _GstVp8FrameHdr          GstVp8FrameHdr;
 typedef struct _GstVp8QuantIndices      GstVp8QuantIndices;
 typedef struct _GstVp8Segmentation      GstVp8Segmentation;
@@ -331,4 +333,6 @@ GstVp8ParserResult
 gst_vp8_parser_parse_frame_header (GstVp8Parser * parser,
     GstVp8FrameHdr * frame_hdr, const guint8 * data, gsize size);
 
+G_END_DECLS
+
 #endif /* GST_VP8_PARSER_H */
-- 
2.7.4