# HG changeset patch
# User diego
# Date 1277044842 0
# Node ID 14f43ed62015fe1fb042e493dcb7c96618c9ea16
# Parent  980678284eb5d61c106eb331b189629dd8a94838
Move sws_flags extern variable declaration to vf_scale.h.

diff -r 980678284eb5 -r 14f43ed62015 cfg-common.h
--- a/cfg-common.h	Sun Jun 20 14:38:54 2010 +0000
+++ b/cfg-common.h	Sun Jun 20 14:40:42 2010 +0000
@@ -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_rawvideo_opts[];
 extern const m_option_t cdda_opts[];
 
-extern int sws_flags;
-
 
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
diff -r 980678284eb5 -r 14f43ed62015 libmpcodecs/vf_scale.h
--- a/libmpcodecs/vf_scale.h	Sun Jun 20 14:38:54 2010 +0000
+++ b/libmpcodecs/vf_scale.h	Sun Jun 20 14:40:42 2010 +0000
@@ -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);
 
diff -r 980678284eb5 -r 14f43ed62015 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Sun Jun 20 14:38:54 2010 +0000
+++ b/libvo/vo_x11.c	Sun Jun 20 14:40:42 2010 +0000
@@ -149,7 +149,6 @@
 
 static struct SwsContext *swsContext = NULL;
 static int dst_width;
-extern int sws_flags;
 
 static XVisualInfo vinfo;