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

diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h
deleted file mode 100644
index 918da82a2..000000000
--- a/src/xine-utils/pool.h
+++ /dev/null
@@ -1,48 +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
- *
- * Object Pool
- */
-
-#include <stdlib.h>
-#include <inttypes.h>
-
-typedef struct xine_pool_s xine_pool_t;
-
-/* Creates a new pool
- *   object_size:    sizeof(your struct)
- *   create_object:  function called to create an object (can be NULL)
- *   prepare_object: function called to prepare an object to returned to the client (can be NULL)
- *   return_object:  function called to prepare an object to returned to the pool (can be NULL)
- *   delete_object:  function called to delete an object (can be NULL)
- */
-xine_pool_t *xine_pool_new(size_t object_size,
-                           void (create_object)(void *object),
-                           void (prepare_object)(void *object),
-                           void (return_object)(void *object),
-                           void (delete_object)(void *object)) XINE_PROTECTED;
-
-/* Deletes a pool */
-void xine_pool_delete(xine_pool_t *pool) XINE_PROTECTED;
-
-/* Get an object from the pool */
-void *xine_pool_get(xine_pool_t *pool) XINE_PROTECTED;
-
-/* Returns an object to the pool */
-void xine_pool_put(xine_pool_t *pool, void *object) XINE_PROTECTED;