diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-01 21:59:29 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-01 21:59:29 +0000 |
commit | 5b882e51309851ebdfc8c8b1959610fa3f825854 (patch) | |
tree | 1d187adc17bdf278cabc9c63486ffa4bc2d1095e /libmpcodecs | |
parent | 56d2da5af429840315d53c26aee476c7b8c2a2ce (diff) | |
download | mpv-5b882e51309851ebdfc8c8b1959610fa3f825854.tar.bz2 mpv-5b882e51309851ebdfc8c8b1959610fa3f825854.tar.xz |
vf_scale.h & related cleanup & some small warning fix by dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10234 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_sab.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.h | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_smartblur.c | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 6750fe6fce..58729b1957 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -34,6 +34,7 @@ #include "vf.h" #include "../libvo/fastmemcpy.h" #include "../postproc/swscale.h" +#include "vf_scale.h" //===========================================================================// diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 92a8ab9c25..7da8a97ae3 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -13,6 +13,7 @@ #include "../libvo/fastmemcpy.h" #include "../postproc/swscale.h" +#include "vf_scale.h" #include "m_option.h" #include "m_struct.h" @@ -30,7 +31,6 @@ static struct vf_priv_s { 0, 0, NULL, - NULL, NULL }; @@ -40,7 +40,6 @@ extern int opt_screen_size_y; //===========================================================================// void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam); -struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); static unsigned int outfmt_list[]={ // RGB: @@ -319,6 +318,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){ return CONTROL_TRUE; default: + break; } return vf_next_control(vf,request,data); diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h new file mode 100644 index 0000000000..8e863af8bc --- /dev/null +++ b/libmpcodecs/vf_scale.h @@ -0,0 +1,4 @@ +//GPL + +int get_sws_cpuflags(); +struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c index 6841347b94..cd817de5d1 100644 --- a/libmpcodecs/vf_smartblur.c +++ b/libmpcodecs/vf_smartblur.c @@ -38,6 +38,7 @@ #include "vf.h" #include "../libvo/fastmemcpy.h" #include "../postproc/swscale.h" +#include "vf_scale.h" //===========================================================================// |