RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
michael 2003-06-01 21:59:29 +00:00
parent 56d2da5af4
commit 5b882e5130
10 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gui/wm/ws.c
View File

@ -25,6 +25,7 @@
#include "../../cpudetect.h"
#include "../../postproc/swscale.h"
#include "../../postproc/rgb2rgb.h"
#include "../../libmpcodecs/vf_scale.h"
#include "../../mp_msg.h"
#include "../../mplayer.h"
@ -93,13 +94,6 @@ inline int wsSearch( Window win );
// ---
static int get_sws_cpuflags()
{
return (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0) |
(gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0) |
(gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0);
}
#define PACK_RGB16(r,g,b,pixel) pixel=(b>>3);\
pixel<<=6;\
pixel|=(g>>2);\

1
libmpcodecs/vf_sab.c
View File

@ -34,6 +34,7 @@
#include "vf.h"
#include "../libvo/fastmemcpy.h"
#include "../postproc/swscale.h"
#include "vf_scale.h"
//===========================================================================//

4
libmpcodecs/vf_scale.c
View File

@ -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);

4
libmpcodecs/vf_scale.h Normal file
View File

@ -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);

1
libmpcodecs/vf_smartblur.c
View File

@ -38,6 +38,7 @@
#include "vf.h"
#include "../libvo/fastmemcpy.h"
#include "../postproc/swscale.h"
#include "vf_scale.h"
//===========================================================================//

8
libvo/mga_common.c
View File

@ -4,6 +4,7 @@
#include "../cpudetect.h"
#include "../postproc/swscale.h"
#include "../postproc/rgb2rgb.h"
#include "../libmpcodecs/vf_scale.h"
#include "mp_msg.h"
// mga_vid drawing functions
@ -415,13 +416,6 @@ static int mga_uninit(){
return 0;
}
static int get_sws_cpuflags(){
return
(gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0)
| (gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0)
| (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0);
}
static uint32_t preinit(const char *vo_subdevice)
{
const char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";

1
libvo/vo_aa.c
View File

@ -28,6 +28,7 @@
#include "video_out_internal.h"
#include "aspect.h"
#include "../postproc/swscale.h"
#include "../libmpcodecs/vf_scale.h"
#include "font_load.h"
#include "sub.h"

1
libvo/vo_vesa.c
View File

@ -45,6 +45,7 @@
#endif
#include "../postproc/swscale.h"
#include "../libmpcodecs/vf_scale.h"
#ifdef HAVE_PNG

1
libvo/vo_x11.c
View File

@ -25,6 +25,7 @@
#include "../postproc/swscale.h"
#include "../postproc/swscale_internal.h" //FIXME
#include "../postproc/rgb2rgb.h"
#include "../libmpcodecs/vf_scale.h"
#include "../mp_msg.h"

2
postproc/rgb2rgb.h
View File

@ -127,4 +127,6 @@ static void yuv2rgb_init (unsigned bpp, int mode){
printf("broken, this should use the swscaler\n");
}
void sws_rgb2rgb_init(int flags);
#endif