1 files changed, 26 insertions, 33 deletions

diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
index ce53e6c8a..c979d290d 100644
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -31,8 +31,8 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #include "ebml.h"
@@ -41,20 +41,10 @@
 ebml_parser_t *new_ebml_parser (xine_t *xine, input_plugin_t *input) {
   ebml_parser_t *ebml;
 
-  ebml = malloc(sizeof(ebml_parser_t));
+  ebml = xine_xmalloc(sizeof(ebml_parser_t));
   ebml->xine                 = xine;
   ebml->input                = input;
 
-  ebml->version              = 0;
-  ebml->read_version         = 0;
-  ebml->max_id_len           = 0;
-  ebml->max_size_len         = 0;
-  ebml->doctype              = NULL;
-  ebml->doctype_version      = 0;
-  ebml->doctype_read_version = 0;
-
-  ebml->level                = 0;
-
   return ebml;
 }
 
@@ -185,7 +175,7 @@ static int ebml_read_elem_len(ebml_parser_t *ebml, uint64_t *len) {
 }
 
 
-static int ebml_read_elem_data(ebml_parser_t *ebml, int8_t *buf, int64_t len) {
+static int ebml_read_elem_data(ebml_parser_t *ebml, void *buf, int64_t len) {
 
   if (ebml->input->read(ebml->input, buf, len) != len) {
     off_t pos = ebml->input->get_current_pos(ebml->input);
@@ -243,6 +233,7 @@ int ebml_read_uint(ebml_parser_t *ebml, ebml_elem_t *elem, uint64_t *num) {
   return 1;
 }
 
+#if 0
 int ebml_read_sint (ebml_parser_t *ebml, ebml_elem_t  *elem, int64_t *num) {
   uint8_t  data[8];
   uint64_t size = elem->len;
@@ -269,6 +260,7 @@ int ebml_read_sint (ebml_parser_t *ebml, ebml_elem_t  *elem, int64_t *num) {
 
   return 1;
 }
+#endif
 
 
 int ebml_read_float (ebml_parser_t *ebml, ebml_elem_t *elem, double *num) {
@@ -313,9 +305,11 @@ int ebml_read_ascii(ebml_parser_t *ebml, ebml_elem_t *elem, char *str) {
   return 1;
 }
 
+#if 0
 int ebml_read_utf8 (ebml_parser_t *ebml, ebml_elem_t *elem, char *str) {
   return ebml_read_ascii (ebml, elem, str);
 }
+#endif
 
 char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml_elem_t *elem)
 {
@@ -333,41 +327,40 @@ char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml_elem_t *elem)
   return NULL;
 }
 
+#if 0
 int ebml_read_date (ebml_parser_t *ebml, ebml_elem_t *elem, int64_t *date) {
   return ebml_read_sint (ebml, elem, date);
 }
+#endif
 
 int ebml_read_master (ebml_parser_t *ebml, ebml_elem_t *elem) {
   ebml_elem_t *top_elem;
 
-  if (ebml->level >= 0) {
-    top_elem = &ebml->elem_stack[ebml->level];
-    top_elem->start = elem->start;
-    top_elem->len = elem->len;
-    top_elem->id = elem->id;
-
-    ebml->level++;
-    lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
-    if (ebml->level >= EBML_STACK_SIZE) {
-      xprintf(ebml->xine, XINE_VERBOSITY_LOG,
-              "ebml: max level exceeded\n");
-      return 0;
-    }
-    return 1;
-  } else {
+  if (ebml->level < 0) {
     xprintf(ebml->xine, XINE_VERBOSITY_LOG,
             "ebml: invalid current level\n");
     return 0;
   }
-}
 
-int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, uint8_t *binary) {
-  if (!ebml_read_elem_data(ebml, binary, elem->len))
-    return 0;
+  top_elem = &ebml->elem_stack[ebml->level];
+  top_elem->start = elem->start;
+  top_elem->len = elem->len;
+  top_elem->id = elem->id;
 
+  ebml->level++;
+  lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
+  if (ebml->level >= EBML_STACK_SIZE) {
+    xprintf(ebml->xine, XINE_VERBOSITY_LOG,
+	    "ebml: max level exceeded\n");
+    return 0;
+  }
   return 1;
 }
 
+int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, void *binary) {
+  return !!ebml_read_elem_data(ebml, binary, elem->len);
+}
+
 int ebml_check_header(ebml_parser_t *ebml) {
   uint32_t next_level;
   ebml_elem_t master;