From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Thu, 23 Sep 2010 22:40:03 +0000 (+0200)
Subject: Move the sdi plugin to C++.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=cad5d305df7ae62b57000988ade32b7b9ff6543e;p=vlc

Move the sdi plugin to C++.
---

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 6aa0bf693e..05395778d6 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -52,7 +52,7 @@ SOURCES_access_avio = avio.c avio.h
 SOURCES_access_attachment = attachment.c
 SOURCES_access_vdr = vdr.c
 SOURCES_libbluray = bluray.c
-SOURCES_sdi = sdi.c
+SOURCES_sdi = sdi.cpp
 
 SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c
 SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c
diff --git a/modules/access/sdi.c b/modules/access/sdi.cpp
similarity index 96%
rename from modules/access/sdi.c
rename to modules/access/sdi.cpp
index d8b4080303..3f5c114333 100644
--- a/modules/access/sdi.c
+++ b/modules/access/sdi.cpp
@@ -4,6 +4,10 @@
 # include "config.h"
 #endif
 
+#ifndef INT64_C
+#define INT64_C(c) c ## LL
+#endif
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
@@ -58,7 +62,7 @@ static int Open( vlc_object_t *p_this )
     p_demux->info.i_update = 0;
     p_demux->info.i_title = 0;
     p_demux->info.i_seekpoint = 0;
-    p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
+    p_demux->p_sys = p_sys = (demux_sys_t*)calloc( 1, sizeof( demux_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;