--- samiparse.c@@/DIST_GST-PLUGINS-BASE-0.10.13	2007-06-19 10:26:22.000000000 -0500
+++ samiparse.c	2007-06-28 13:07:25.000000000 -0500
@@ -45,7 +45,7 @@
                                  * that tags can be closed properly on
                                  * 'sync' tags. See _context_push_state()
                                  * and _context_pop_state(). */
-  htmlParserCtxtPtr htmlctxt;   /* html parser context */
+  xmlParserCtxtPtr xmlctxt;     /* xml parser context */
   gboolean has_result;          /* set when ready to push out result */
   gboolean in_title;            /* flag to avoid appending the title content
                                  * to buf */
@@ -316,8 +316,8 @@
   state->user_data = (gpointer) g_new0 (GstSamiContext, 1);
   context = (GstSamiContext *) state->user_data;
 
-  context->htmlctxt = htmlCreatePushParserCtxt (samiSAXHandler, context,
-      "", 0, NULL, XML_CHAR_ENCODING_UTF8);
+  context->xmlctxt = xmlCreatePushParserCtxt (samiSAXHandler, context,
+      "", 0, NULL);
   context->buf = g_string_new ("");
   context->rubybuf = g_string_new ("");
   context->resultbuf = g_string_new ("");
@@ -330,15 +330,15 @@
   GstSamiContext *context = (GstSamiContext *) state->user_data;
 
   if (context) {
-    htmlParserCtxtPtr htmlctxt = context->htmlctxt;
+    xmlParserCtxtPtr xmlctxt = context->xmlctxt;
 
     /* destroy sax context */
-    htmlDocPtr doc;
+    xmlDocPtr doc;
 
-    htmlParseChunk (htmlctxt, "", 0, 1);
-    doc = htmlctxt->myDoc;
-    htmlFreeParserCtxt (htmlctxt);
-    context->htmlctxt = NULL;
+    xmlParseChunk (xmlctxt, "", 0, 1);
+    doc = xmlctxt->myDoc;
+    xmlFreeParserCtxt (xmlctxt);
+    context->xmlctxt = NULL;
     if (doc)
       xmlFreeDoc (doc);
     g_string_free (context->buf, TRUE);
@@ -413,7 +413,7 @@
   GstSamiContext *context = (GstSamiContext *) state->user_data;
 
   fixed_line = fix_invalid_entities (line);
-  htmlParseChunk (context->htmlctxt, fixed_line, strlen (fixed_line), 0);
+  xmlParseChunk (context->xmlctxt, fixed_line, strlen (fixed_line), 0);
   g_free (fixed_line);
 
   if (context->has_result) {
