[MPlayer-cvslog] r31482 - in trunk: cfg-common.h libmpcodecs/vf_scale.h libvo/vo_x11.c

[diego]

Author: diego
Date: Sun Jun 20 16:40:42 2010
New Revision: 31482

Log:
Move sws_flags extern variable declaration to vf_scale.h.

Modified:
   trunk/cfg-common.h
   trunk/libmpcodecs/vf_scale.h
   trunk/libvo/vo_x11.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 16:38:54 2010	(r31481)
+++ trunk/cfg-common.h	Sun Jun 20 16:40:42 2010	(r31482)
@@ -29,6 +29,7 @@
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vd.h"
+#include "libmpcodecs/vf_scale.h"
 #include "libmpdemux/demux_mpg.h"
 #include "libmpdemux/demux_ts.h"
 #include "libmpdemux/demux_viv.h"
@@ -48,8 +49,6 @@ extern const m_option_t demux_rawaudio_o
 extern const m_option_t demux_rawvideo_opts[];
 extern const m_option_t cdda_opts[];
 
-extern int sws_flags;
-
 
 #include "stream/tv.h"
 #include "stream/stream_radio.h"

Modified: trunk/libmpcodecs/vf_scale.h
==============================================================================
--- trunk/libmpcodecs/vf_scale.h	Sun Jun 20 16:38:54 2010	(r31481)
+++ trunk/libmpcodecs/vf_scale.h	Sun Jun 20 16:40:42 2010	(r31482)
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_VF_SCALE_H
 #define MPLAYER_VF_SCALE_H
 
+extern int sws_flags;
+
 int get_sws_cpuflags(void);
 struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
 

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	Sun Jun 20 16:38:54 2010	(r31481)
+++ trunk/libvo/vo_x11.c	Sun Jun 20 16:40:42 2010	(r31482)
@@ -149,7 +149,6 @@ static void draw_alpha_null(int x0, int 
 
 static struct SwsContext *swsContext = NULL;
 static int dst_width;
-extern int sws_flags;
 
 static XVisualInfo vinfo;