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

7 files changed, 7 insertions, 7 deletions

diff --git a/contrib/a52dec/imdct.c b/contrib/a52dec/imdct.c
index 5835e70a1..aa1c85464 100644
--- a/contrib/a52dec/imdct.c
+++ b/contrib/a52dec/imdct.c
@@ -38,7 +38,7 @@
 
 #include "a52.h"
 #include "a52_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 typedef struct complex_s {
     sample_t real;
diff --git a/contrib/a52dec/parse.c b/contrib/a52dec/parse.c
index 0bfd02fce..7aba1d809 100644
--- a/contrib/a52dec/parse.c
+++ b/contrib/a52dec/parse.c
@@ -31,7 +31,7 @@
 #include "a52_internal.h"
 #include "bitstream.h"
 #include "tables.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 typedef struct {
     sample_t q1[2];
diff --git a/contrib/gsm610/long_term.c b/contrib/gsm610/long_term.c
index 625662e1f..671d98cc1 100644
--- a/contrib/gsm610/long_term.c
+++ b/contrib/gsm610/long_term.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/long_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #include "private.h"
 
diff --git a/contrib/gsm610/lpc.c b/contrib/gsm610/lpc.c
index 0f51fa55f..d85f56111 100644
--- a/contrib/gsm610/lpc.c
+++ b/contrib/gsm610/lpc.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/lpc.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #include "private.h"
 
diff --git a/contrib/gsm610/rpe.c b/contrib/gsm610/rpe.c
index 67d94d30e..68d495b3b 100644
--- a/contrib/gsm610/rpe.c
+++ b/contrib/gsm610/rpe.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/rpe.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "private.h"
 
 #include "gsm.h"
diff --git a/contrib/gsm610/short_term.c b/contrib/gsm610/short_term.c
index 8222b2caa..34a9e7734 100644
--- a/contrib/gsm610/short_term.c
+++ b/contrib/gsm610/short_term.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/short_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "private.h"
 
 #include "gsm.h"
diff --git a/contrib/nosefart/log.h b/contrib/nosefart/log.h
index a12deff0a..da2548c80 100644
--- a/contrib/nosefart/log.h
+++ b/contrib/nosefart/log.h
@@ -27,7 +27,7 @@
 #define _LOG_H_
 
 #include <stdio.h>
-#include "attributes.h"
+#include <xine/attributes.h>
 
 extern int log_init(void);
 extern void log_shutdown(void);