Software Scaler headers usage cleanup

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18749 b3059339-0415-0410-9bf9-f77b7e298cf2

14 files changed, 11 insertions, 22 deletions

diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c
index 3f4fed1fdb..139a71b9be 100644
--- a/libmpcodecs/vd_ijpg.c
+++ b/libmpcodecs/vd_ijpg.c
@@ -12,7 +12,6 @@
 #include <setjmp.h>
 
 #include "bswap.h"
-#include "postproc/rgb2rgb.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c
index 3c2078e353..730385015f 100644
--- a/libmpcodecs/vd_mpng.c
+++ b/libmpcodecs/vd_mpng.c
@@ -9,7 +9,6 @@
 #include <png.h>
 
 #include "bswap.h"
-#include "postproc/rgb2rgb.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c
index b388d0d4b4..cbd44d5e28 100644
--- a/libmpcodecs/vd_mtga.c
+++ b/libmpcodecs/vd_mtga.c
@@ -11,7 +11,6 @@
 #include "mp_msg.h"
 
 #include "bswap.h"
-#include "postproc/rgb2rgb.h"
 #include "libvo/fastmemcpy.h"
 
 #include "vd_internal.h"
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index e3aa9d8184..d0e4ffd007 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/libmpcodecs/vf_1bpp.c
@@ -10,8 +10,6 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "postproc/rgb2rgb.h"
-
 //===========================================================================//
 
 static unsigned int bgr_list[]={
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
index 3f0d7a3e7e..dfb9b34228 100644
--- a/libmpcodecs/vf_cropdetect.c
+++ b/libmpcodecs/vf_cropdetect.c
@@ -12,7 +12,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int x1,y1,x2,y2;
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index 5350903bae..84e2f693b2 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/libmpcodecs/vf_down3dright.c
@@ -12,7 +12,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
 	int skipline;
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 504e91a605..ae05aede7c 100644
--- a/libmpcodecs/vf_eq.c
+++ b/libmpcodecs/vf_eq.c
@@ -14,7 +14,6 @@
 
 #include "libvo/video_out.h"
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 #include "m_option.h"
 #include "m_struct.h"
diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c
index 7eb65c5818..3123f9226a 100644
--- a/libmpcodecs/vf_ilpack.c
+++ b/libmpcodecs/vf_ilpack.c
@@ -13,7 +13,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
 	unsigned char *u, unsigned char *v, int w, int us, int vs);
diff --git a/libmpcodecs/vf_mirror.c b/libmpcodecs/vf_mirror.c
index 49e3bbc324..2466befc5a 100644
--- a/libmpcodecs/vf_mirror.c
+++ b/libmpcodecs/vf_mirror.c
@@ -11,7 +11,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 
 static void mirror(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,unsigned int fmt){
diff --git a/libmpcodecs/vf_rotate.c b/libmpcodecs/vf_rotate.c
index 01535d62a9..b4cf03b647 100644
--- a/libmpcodecs/vf_rotate.c
+++ b/libmpcodecs/vf_rotate.c
@@ -11,7 +11,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int direction;
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index f07c96d2d5..2998aa77ca 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -24,7 +24,6 @@
 
 #include "libvo/fastmemcpy.h"
 #include "postproc/swscale.h"
-#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int frameno;
diff --git a/libmpcodecs/vf_yvu9.c b/libmpcodecs/vf_yvu9.c
index 654a90dbd7..f22053934c 100644
--- a/libmpcodecs/vf_yvu9.c
+++ b/libmpcodecs/vf_yvu9.c
@@ -12,7 +12,6 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 83ca93acce..ba8fce6e57 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -2,7 +2,6 @@
 #include "fastmemcpy.h"
 #include "cpudetect.h"
 #include "postproc/swscale.h"
-#include "postproc/rgb2rgb.h"
 #include "libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 #include "help_mp.h"
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 1e9f8b98e0..173aea86d4 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -39,9 +39,9 @@ int XShmGetEventBase(Display *);
 #include "sub.h"
 
 #include "postproc/swscale.h"
-#include "postproc/swscale_internal.h"       //FIXME
-#include "postproc/rgb2rgb.h"
 #include "libmpcodecs/vf_scale.h"
+#define MODE_RGB  0x1
+#define MODE_BGR  0x2
 
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -144,7 +144,8 @@ static void draw_alpha_null(int x0, int y0, int w, int h,
 {
 }
 
-static SwsContext *swsContext = NULL;
+static struct SwsContext *swsContext = NULL;
+static int dst_width;
 extern int sws_flags;
 
 static XVisualInfo vinfo;
@@ -509,6 +510,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     if (!swsContext)
         return -1;
 
+    dst_width = width;
     //printf( "X11 bpp: %d  color mask:  R:%lX  G:%lX  B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask );
 
     // If we have blue in the lowest bit then obviously RGB
@@ -553,16 +555,16 @@ static void Display_Image(XImage * myximage, uint8_t * ImageData)
     {
         XShmPutImage(mDisplay, vo_window, vo_gc, myximage,
                      0, 0,
-                     (vo_dwidth - swsContext->dstW) / 2,
-                     (vo_dheight - myximage->height) / 2, swsContext->dstW,
+                     (vo_dwidth - dst_width) / 2,
+                     (vo_dheight - myximage->height) / 2, dst_width,
                      myximage->height, True);
     } else
 #endif
     {
         XPutImage(mDisplay, vo_window, vo_gc, myximage,
                   0, 0,
-                  (vo_dwidth - swsContext->dstW) / 2,
-                  (vo_dheight - myximage->height) / 2, swsContext->dstW,
+                  (vo_dwidth - dst_width) / 2,
+                  (vo_dheight - myximage->height) / 2, dst_width,
                   myximage->height);
     }
 }
@@ -590,7 +592,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
         int newW = vo_dwidth;
         int newH = vo_dheight;
         int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH;
-        SwsContext *oldContext = swsContext;
+        struct SwsContext *oldContext = swsContext;
 
         if (newAspect > aspect)
             newW = (newH * aspect + (1 << 15)) >> 16;
@@ -617,6 +619,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
         {
             swsContext = oldContext;
         }
+        dst_width = newW;
     }
     dstStride[1] = dstStride[2] = 0;
     dst[1] = dst[2] = NULL;