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

diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h
deleted file mode 100644
index bfe71a6b1..000000000
--- a/src/libffmpeg/ffmpeg_decoder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2001-2005 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
- */
- 
-#ifndef HAVE_XINE_DECODER_H
-#define HAVE_XINE_DECODER_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <avcodec.h>
-
-typedef struct ff_codec_s {
-  uint32_t          type;
-  enum CodecID      id;
-  const char       *name;
-} ff_codec_t;
-
-void *init_audio_plugin (xine_t *xine, void *data);
-void *init_video_plugin (xine_t *xine, void *data);
-
-extern decoder_info_t dec_info_ffmpeg_video;
-extern decoder_info_t dec_info_ffmpeg_wmv8;
-extern decoder_info_t dec_info_ffmpeg_wmv9;
-extern decoder_info_t dec_info_ffmpeg_audio;
-
-extern pthread_once_t once_control;
-void init_once_routine(void);
-
-extern pthread_mutex_t ffmpeg_lock;
-
-#endif