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

9 files changed, 11 insertions, 11 deletions

diff --git a/src/libmpeg2new/libmpeg2/idct_alpha.c b/src/libmpeg2new/libmpeg2/idct_alpha.c
index 8f9beaf22..1d8fd08ee 100644
--- a/src/libmpeg2new/libmpeg2/idct_alpha.c
+++ b/src/libmpeg2new/libmpeg2/idct_alpha.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "alpha_asm.h"
 
diff --git a/src/libmpeg2new/libmpeg2/idct_altivec.c b/src/libmpeg2new/libmpeg2/idct_altivec.c
index 6b1b8586c..f15bca165 100644
--- a/src/libmpeg2new/libmpeg2/idct_altivec.c
+++ b/src/libmpeg2new/libmpeg2/idct_altivec.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 
 typedef vector signed char vector_s8_t;
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_alpha.c b/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
index 05cd55084..1b3712a1a 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "alpha_asm.h"
 
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_altivec.c b/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
index 4356aa6e7..ee740e14e 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 
 typedef vector signed char vector_s8_t;
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_vis.c b/src/libmpeg2new/libmpeg2/motion_comp_vis.c
index 54c0f7e75..e724d28a2 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_vis.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_vis.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "vis.h"
 
diff --git a/src/libmpeg2new/libmpeg2/rgb.c b/src/libmpeg2new/libmpeg2/rgb.c
index 8863b0b9f..e4abcacc2 100644
--- a/src/libmpeg2new/libmpeg2/rgb.c
+++ b/src/libmpeg2new/libmpeg2/rgb.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include <inttypes.h>
 
diff --git a/src/libmpeg2new/libmpeg2/rgb_mmx.c b/src/libmpeg2new/libmpeg2/rgb_mmx.c
index 912291c6a..6ca7e65a8 100644
--- a/src/libmpeg2new/libmpeg2/rgb_mmx.c
+++ b/src/libmpeg2new/libmpeg2/rgb_mmx.c
@@ -34,7 +34,7 @@
 #include "mpeg2.h"
 #include "mpeg2convert.h"
 #include "convert_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mmx.h"
 
 #define CPU_MMXEXT 0
diff --git a/src/libmpeg2new/libmpeg2/rgb_vis.c b/src/libmpeg2new/libmpeg2/rgb_vis.c
index 49d8d1d7c..cbd7c7072 100644
--- a/src/libmpeg2new/libmpeg2/rgb_vis.c
+++ b/src/libmpeg2new/libmpeg2/rgb_vis.c
@@ -30,7 +30,7 @@
 #include "mpeg2.h"
 #include "mpeg2convert.h"
 #include "convert_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "vis.h"
 
 /* Based partially upon the MMX yuv2rgb code, see there for credits.
diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c
index 386b0049d..eeafee9c1 100644
--- a/src/libmpeg2new/xine_mpeg2new_decoder.c
+++ b/src/libmpeg2new/xine_mpeg2new_decoder.c
@@ -31,9 +31,9 @@
 #include <assert.h>
 
 #include "./include/mpeg2.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>