[vlc-commits] decoder: svg: ifdef deprecated api

Francois Cartegnie git at videolan.org
Thu Dec 29 22:44:47 CET 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 29 22:44:05 2016 +0100| [facd1712df4c6aa649f892fa1f1496c0545b33ab] | committer: Francois Cartegnie

decoder: svg: ifdef deprecated api

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=facd1712df4c6aa649f892fa1f1496c0545b33ab
---

 modules/codec/svg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/codec/svg.c b/modules/codec/svg.c
index 107f44b..b2ea456 100644
--- a/modules/codec/svg.c
+++ b/modules/codec/svg.c
@@ -103,7 +103,9 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_sys->f_scale = var_InheritFloat( p_this, "svg-scale" );
 
     /* Initialize library */
-    rsvg_init();
+#if (GLIB_MAJOR_VERSION < 2 || GLIB_MINOR_VERSION < 36)
+    g_type_init();
+#endif
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = VIDEO_ES;
@@ -266,5 +268,7 @@ done:
 static void CloseDecoder( vlc_object_t *p_this )
 {
     VLC_UNUSED( p_this );
+#if (GLIB_MAJOR_VERSION < 2 || GLIB_MINOR_VERSION < 36)
     rsvg_term();
+#endif
 }



More information about the vlc-commits mailing list