Merge from 1.2 main branch.

--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c

1 files changed, 0 insertions, 99 deletions

diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h
deleted file mode 100644
index c89cb6dd3..000000000
--- a/src/xine-utils/xmlparser.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (C) 2002-2003,2007 the xine project
- *
- *  This file is part of xine, a free video player.
- *
- * The xine-lib XML parser is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The xine-lib XML parser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110, USA
- */
-
-#ifndef XML_PARSER_H
-#define XML_PARSER_H
-
-#ifndef XINE_PROTECTED
-#define XINE_PROTECTED
-#endif
-
-/* parser modes */
-#define XML_PARSER_CASE_INSENSITIVE  0
-#define XML_PARSER_CASE_SENSITIVE    1
-
-/* return codes */
-#define XML_PARSER_OK                0
-#define XML_PARSER_ERROR             1
-
-/* xml_parser_build_tree_with_options flag bits */
-#define XML_PARSER_RELAXED		1
-#define XML_PARSER_MULTI_TEXT		2
-
-/* node name for extra text chunks */
-#define CDATA_MARKER "[CDATA]"
-
-/* xml property */
-typedef struct xml_property_s {
-	char *name;
-	char *value;
-	struct xml_property_s *next;
-} xml_property_t;
-
-/* xml node */
-/* .data contains any text which precedes any subtree elements;
- * subtree elements may also contain only text; if so, name is "[CDATA]".
- * e.g. <a>b<c />d</a>
- *   node1: .name="a"       .data="b"  .child=node2 .next=NULL
- *   node2: .name="c"       .data=NULL .child=NULL  .next=node3
- *   node3: .name="[CDATA]" .data="d"  .child=NULL  .next=NULL
- * Adjacent text items are merged.
- */
-typedef struct xml_node_s {
-	char *name;
-	char *data;
-	struct xml_property_s *props;
-	struct xml_node_s *child;
-	struct xml_node_s *next;
-} xml_node_t;
-
-void xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED;
-
-int xml_parser_build_tree(xml_node_t **root_node) XINE_PROTECTED;
-int xml_parser_build_tree_with_options(xml_node_t **root_node, int flags) XINE_PROTECTED;
-
-void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED;
-
-const char *xml_parser_get_property (const xml_node_t *node, const char *name) XINE_PROTECTED;
-int   xml_parser_get_property_int (const xml_node_t *node, const char *name, 
-				   int def_value) XINE_PROTECTED;
-int xml_parser_get_property_bool (const xml_node_t *node, const char *name, 
-				  int def_value) XINE_PROTECTED;
-
-/* for output:
- * returns an escaped string (free() it when done)
- * input must be in ASCII or UTF-8
- */
-
-typedef enum {
-  XML_ESCAPE_NO_QUOTE,
-  XML_ESCAPE_SINGLE_QUOTE,
-  XML_ESCAPE_DOUBLE_QUOTE
-} xml_escape_quote_t;
-char *xml_escape_string (const char *s, xml_escape_quote_t quote_type) XINE_PROTECTED;
-
-/* for debugging purposes: dump read-in xml tree in a nicely
- * indented fashion
- */
-
-void xml_parser_dump_tree (const xml_node_t *node) XINE_PROTECTED;
-
-#endif