Merge -headers-reshuffle branch into main.

--HG--
rename : src/xine-engine/osd.h => include/xine/osd.h

11 files changed, 30 insertions, 30 deletions

diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 225e75954..988729af0 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 /* plugin class initialization function */
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index fb7021ece..bec59b35f 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index 03f647d68..e62a808c1 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -21,9 +21,9 @@
  * Copyright (C) Richard Felker
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index ceb9f9024..42f4580d9 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -25,9 +25,9 @@
  * Richard Felker (original MMX contrast/brightness code (vf_eq.c))
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index db62a5512..90547163f 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -27,8 +27,8 @@
  *
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* The expand trick explained:
  *
diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c
index 62fdc1381..6dd5ce23b 100644
--- a/src/post/planar/fill.c
+++ b/src/post/planar/fill.c
@@ -22,8 +22,8 @@
  * based on invert.c
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* plugin class initialization function */
 void *fill_init_plugin(xine_t *xine, void *);
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index b5ee1e3f2..8c1b6103a 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.c
@@ -22,8 +22,8 @@
  * simple video inverter plugin
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 
 /* plugin class initialization function */
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 4ca3d62dc..efc3e49f8 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -21,9 +21,9 @@
  * is copyright 2002 Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c
index 5907d58e5..220fce68e 100644
--- a/src/post/planar/planar.c
+++ b/src/post/planar/planar.c
@@ -20,9 +20,9 @@
  * catalog for planar post plugins
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 
 extern void *invert_init_plugin(xine_t *xine, void *);
 static const post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 1213c82df..f8c571dcb 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include "postprocess.h"
 #include <pthread.h>
 
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index ff86f21bc..591f32a7b 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 #ifndef MIN