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

diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h
deleted file mode 100644
index 40b4de486..000000000
--- a/src/xine-engine/resample.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2000-2003 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
- *
- * utilitiy functions for audio drivers
- *
- * FIXME: not all of them are implemented yet
- */
-
-#ifndef HAVE_RESAMPLE_H
-#define HAVE_RESAMPLE_H
-
-#define RESAMPLE_MAX_CHANNELS 6
-
-void _x_audio_out_resample_stereo(int16_t* last_sample,
-				  int16_t* input_samples, uint32_t in_samples, 
-				  int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_mono(int16_t* last_sample,
-				int16_t* input_samples, uint32_t in_samples, 
-				int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_4channel(int16_t* last_sample,
-				    int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_5channel(int16_t* last_sample,
-				    int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_6channel(int16_t* last_sample,
-				    int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_8to16(int8_t* input_samples, 
-				 int16_t* output_samples, uint32_t samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_16to8(int16_t* input_samples, 
-				 int8_t*  output_samples, uint32_t samples) XINE_PROTECTED;
-
-void _x_audio_out_resample_monotostereo(int16_t* input_samples, 
-					int16_t* output_samples, uint32_t frames) XINE_PROTECTED;
-
-void _x_audio_out_resample_stereotomono(int16_t* input_samples, 
-					int16_t* output_samples, uint32_t frames) XINE_PROTECTED;
-                            
-#endif