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

diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h
deleted file mode 100644
index ae2093823..000000000
--- a/src/xine-utils/array.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
- * Copyright (C) 2000-2006 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine 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 General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * Array that can grow automatically when you add elements.
- * Inserting an element in the middle of the array implies memory moves.
- */
-#ifndef XINE_ARRAY_H
-#define XINE_ARRAY_H
-
-/* Array type */
-typedef struct xine_array_s xine_array_t;
-
-/* Constructor */
-xine_array_t *xine_array_new(size_t initial_size) XINE_PROTECTED;
-
-/* Destructor */
-void xine_array_delete(xine_array_t *array) XINE_PROTECTED;
-
-/* Returns the number of element stored in the array */
-size_t xine_array_size(const xine_array_t *array) XINE_PROTECTED;
-
-/* Removes all elements from an array */
-void xine_array_clear(xine_array_t *array) XINE_PROTECTED;
-
-/* Adds the element at the end of the array */
-void xine_array_add(xine_array_t *array, void *value) XINE_PROTECTED;
-
-/* Inserts an element into an array at the position specified */
-void xine_array_insert(xine_array_t *array, unsigned int position, void *value) XINE_PROTECTED;
-
-/* Removes one element from an array at the position specified */
-void xine_array_remove(xine_array_t *array, unsigned int position) XINE_PROTECTED;
-
-/* Get the element at the position specified */
-void *xine_array_get(const xine_array_t *array, unsigned int position) XINE_PROTECTED;
-
-/* Set the element at the position specified */
-void xine_array_set(xine_array_t *array, unsigned int position, void *value) XINE_PROTECTED;
-
-#endif
-