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, 59 deletions

diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h
deleted file mode 100644
index 10bcc8676..000000000
--- a/src/xine-utils/xmllexer.h
+++ /dev/null
@@ -1,59 +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
- */
-
-/* xml lexer */
-#ifndef XML_LEXER_H
-#define XML_LEXER_H
-
-#ifndef XINE_PROTECTED
-#define XINE_PROTECTED
-#endif
-
-/* public constants */
-#define T_ERROR         -1   /* lexer error */
-#define T_EOF            0   /* end of file */
-#define T_EOL            1   /* end of line */
-#define T_SEPAR          2   /* separator ' ' '/t' '\n' '\r' */
-#define T_M_START_1      3   /* markup start < */
-#define T_M_START_2      4   /* markup start </ */
-#define T_M_STOP_1       5   /* markup stop > */
-#define T_M_STOP_2       6   /* markup stop /> */
-#define T_EQUAL          7   /* = */
-#define T_QUOTE          8   /* \" or \' */
-#define T_STRING         9   /* "string" */
-#define T_IDENT         10   /* identifier */
-#define T_DATA          11   /* data */
-#define T_C_START       12   /* <!-- */
-#define T_C_STOP        13   /* --> */
-#define T_TI_START      14   /* <? */
-#define T_TI_STOP       15   /* ?> */
-#define T_DOCTYPE_START 16   /* <!DOCTYPE */
-#define T_DOCTYPE_STOP  17   /* > */
-#define T_CDATA_START   18   /* <![CDATA[ */
-#define T_CDATA_STOP    19   /* ]]> */
-
-
-/* public functions */
-void lexer_init(const char * buf, int size) XINE_PROTECTED;
-int lexer_get_token(char * tok, int tok_size) XINE_PROTECTED;
-char *lexer_decode_entities (const char *tok) XINE_PROTECTED;
-
-#endif