[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[325] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[325] mplayerxp
|
From: <nic...@us...> - 2012-11-11 10:15:02
|
Revision: 325
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=325&view=rev
Author: nickols_k
Date: 2012-11-11 10:14:52 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
remove redundant argument
Modified Paths:
--------------
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpcodecs/vd.h
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_libdv.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_mpegpes.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/video_out.h
mplayerxp/libvo/video_out_internal.h
mplayerxp/libvo/vo_dga.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_null.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/libvo/vosub_vidix.h
mplayerxp/postproc/vf.c
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.c
mplayerxp/postproc/vf_2xsai.c
mplayerxp/postproc/vf_aspect.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_denoise3d.c
mplayerxp/postproc/vf_dint.c
mplayerxp/postproc/vf_down3dright.c
mplayerxp/postproc/vf_eq.c
mplayerxp/postproc/vf_expand.c
mplayerxp/postproc/vf_flip.c
mplayerxp/postproc/vf_format.c
mplayerxp/postproc/vf_menu.c
mplayerxp/postproc/vf_mirror.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_ow.c
mplayerxp/postproc/vf_palette.c
mplayerxp/postproc/vf_panscan.c
mplayerxp/postproc/vf_perspective.c
mplayerxp/postproc/vf_pp.c
mplayerxp/postproc/vf_raw.c
mplayerxp/postproc/vf_rectangle.c
mplayerxp/postproc/vf_rgb2bgr.c
mplayerxp/postproc/vf_rotate.c
mplayerxp/postproc/vf_scale.c
mplayerxp/postproc/vf_smartblur.c
mplayerxp/postproc/vf_softpulldown.c
mplayerxp/postproc/vf_test.c
mplayerxp/postproc/vf_unsharp.c
mplayerxp/postproc/vf_vo.c
mplayerxp/postproc/vf_yuvcsp.c
mplayerxp/postproc/vf_yuy2.c
mplayerxp/postproc/vf_yvu9.c
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -96,7 +96,7 @@
extern vo_data_t* vo_data;
extern const vd_functions_t* mpvdec; // FIXME!
-MPXP_Rc mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t*tune, any_t* libinput){
+MPXP_Rc mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t* libinput){
int i,j;
unsigned int out_fmt=0;
int screen_size_x=0;//SCREEN_SIZE_X;
@@ -250,16 +250,16 @@
if(vf->config(vf,sh->src_w,sh->src_h,
screen_size_x,screen_size_y,
vo_data->flags,
- out_fmt,tune)==0){
+ out_fmt)==0){
MSG_WARN(MSGTR_CannotInitVO);
sh->vfilter_inited=-1;
return MPXP_False;
}
- MSG_DBG2("vf->config(%dx%d->%dx%d,flags=%d,'%s',%p)\n",
+ MSG_DBG2("vf->config(%dx%d->%dx%d,flags=%d,'%s')\n",
sh->src_w,sh->src_h,
screen_size_x,screen_size_y,
vo_data->flags,
- vo_format_name(out_fmt),tune);
+ vo_format_name(out_fmt));
return MPXP_True;
}
Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd.h 2012-11-11 10:14:52 UTC (rev 325)
@@ -34,7 +34,7 @@
VDCTRL_RESYNC_STREAM =7 /* resync video stream if needed */
};
// callbacks:
-MPXP_Rc __FASTCALL__ mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t*tune, any_t* libinput);
+MPXP_Rc __FASTCALL__ mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t* libinput);
mp_image_t* __FASTCALL__ mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,int w, int h);
void __FASTCALL__ mpcodecs_draw_slice(sh_video_t* sh, mp_image_t*);
void __FASTCALL__ mpcodecs_draw_image(sh_video_t* sh, mp_image_t *mpi);
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -192,7 +192,7 @@
priv_t*p;
int bits=12;
if(!load_lib("libdivx"SLIBSUFFIX)) return MPXP_False;
- if(!(mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput))) return MPXP_False;
+ if(!(mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput))) return MPXP_False;
switch(sh->codec->outfmt[sh->outfmtidx]){
case IMGFMT_YV12:
case IMGFMT_I420:
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -53,7 +53,7 @@
"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.tar.bz2!\n");
return MPXP_False;
}
- if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput)) return MPXP_False;
+ if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
out_fmt=sh->codec->outfmt[sh->outfmtidx];
switch(out_fmt){
case IMGFMT_YUY2:
Modified: mplayerxp/libmpcodecs/vd_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -69,7 +69,7 @@
MSG_HINT("package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n");
return MPXP_False;
}
- if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput)) return MPXP_False;
+ if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
out_fmt=sh->codec->outfmt[sh->outfmtidx];
switch(out_fmt){
case IMGFMT_YUY2:
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -186,30 +186,6 @@
return MPXP_Unknown;
}
-static MPXP_Rc ff_config_vo(sh_video_t *sh,uint32_t w,uint32_t h,any_t* libinput)
-{
- priv_t *priv=sh->context;
- vo_tune_info_t vfi;
- if(!priv->vo_inited) {
- unsigned halign=15,valign=15;
- vfi.pitch[0]=32;
- vfi.pitch[1]=
- vfi.pitch[2]=16;
- if(priv->ctx->pix_fmt == PIX_FMT_YUV410P && priv->cap_dr1) {
- //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)
- valign=63;
- vfi.pitch[0]=64;
- vfi.pitch[1]=
- vfi.pitch[2]=16;
- }
- sh->src_w=w;//(w+valign)&(~valign);
- sh->src_h=(h+halign)&(~halign);
- priv->vo_inited=1;
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,&vfi,libinput);
- }
- return MPXP_Ok;
-}
-
static MPXP_Rc find_vdecoder(sh_video_t* sh) {
unsigned i;
unsigned char flag = CODECS_FLAG_NOFLIP;
@@ -420,7 +396,7 @@
}
if(pp_flags) ppContext=pp2_get_context(sh->src_w,sh->src_h,pp_flags);
}
- return ff_config_vo(sh,sh->src_w,sh->src_h,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_huffyuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_huffyuv.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -314,7 +314,7 @@
switch (priv->bitmaptype) {
case BMPTYPE_RGB:
case BMPTYPE_YUV:
- vo_ret = mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ vo_ret = mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
break;
case BMPTYPE_RGBA:
MSG_ERR( "[HuffYUV] RGBA not supported yet.\n");
Modified: mplayerxp/libmpcodecs/vd_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_libdv.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -52,7 +52,7 @@
static MPXP_Rc init(sh_video_t *sh,any_t* libinput)
{
sh->context = (any_t*)init_global_rawdv_decoder();
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -185,7 +185,7 @@
if(!load_lib("libmpeg2"SLIBSUFFIX)) return MPXP_False;
priv=sh->context=mp_malloc(sizeof(priv_t));
if(!(priv->mpeg2dec=mpeg2_init(mp_data->mplayer_accel))) return MPXP_False;
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_mpegpes.c
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_mpegpes.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -25,7 +25,7 @@
// init driver
static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_nuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_nuv.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -33,7 +33,7 @@
// init driver
static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -288,9 +288,9 @@
}
MSG_V("imgfmt: %s qt_imgfmt: %.4s\n", vo_format_name(imgfmt), &qt_imgfmt);
sh->context = qt_imgfmt;
- if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput)) return MPXP_False;
+ if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
#else
- if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput)) return MPXP_False;
+ if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
#endif
return MPXP_Ok;
}
Modified: mplayerxp/libmpcodecs/vd_raw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_raw.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -42,7 +42,7 @@
MSG_WARN("RAW: depth %d not supported\n",sh->bih->biBitCount);
}
}
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_real.c
===================================================================
--- mplayerxp/libmpcodecs/vd_real.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_real.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -163,7 +163,7 @@
if(!load_syms(sh->codec->dll_name)) return MPXP_False;
// only I420 supported
- if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput)) return MPXP_False;
+ if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
// init codec:
sh->context=NULL;
result=(*rvyuv_init)(&init_data, &sh->context);
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_theora.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -111,7 +111,7 @@
MSG_V("INFO: Theora video init ok!\n");
- return mpcodecs_config_vo (sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo (sh,sh->src_w,sh->src_h,libinput);
}
/*
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -256,7 +256,7 @@
priv->ex = vfw_ex;
if(init_vfw_video_codec(sh)!=MPXP_Ok) return MPXP_False;
MSG_V("INFO: Win32/VFW init OK!\n");
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -874,7 +874,7 @@
// init driver
static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
if(xacodec_init_video(sh,sh->codec->outfmt[sh->outfmtidx]))
- return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,NULL,libinput);
+ return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
return MPXP_False;
}
Modified: mplayerxp/libmpcodecs/vd_xvid.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libmpcodecs/vd_xvid.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -380,7 +380,7 @@
priv->img_type = MP_IMGTYPE_TEMP;
break;
}
- return mpcodecs_config_vo(sh, sh->src_w, sh->src_h, NULL,libinput);
+ return mpcodecs_config_vo(sh, sh->src_w, sh->src_h,libinput);
}
// uninit driver
Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/video_out.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -400,7 +400,7 @@
static int vo_inited=0;
MPXP_Rc __FASTCALL__ vo_config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *vti)
+ uint32_t format)
{
vo_priv_t* priv=(vo_priv_t*)vo->vo_priv;
MPXP_Rc retval;
@@ -424,7 +424,7 @@
priv->dri.d_height = d_h;
MSG_V("video_out->config(%u,%u,%u,%u,0x%x,'%s',%s)\n"
,w,h,d_w,d_h,fullscreen,title,vo_format_name(dest_fourcc));
- retval = video_out->config(vo,w,h,d_w,d_h,fullscreen,title,dest_fourcc,vti);
+ retval = video_out->config(vo,w,h,d_w,d_h,fullscreen,title,dest_fourcc);
priv->srcFourcc=format;
if(retval == MPXP_Ok) {
int dri_retv;
Modified: mplayerxp/libvo/video_out.h
===================================================================
--- mplayerxp/libvo/video_out.h 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/video_out.h 2012-11-11 10:14:52 UTC (rev 325)
@@ -64,12 +64,6 @@
const char *comment; /**< any additional comments */
} vo_info_t;
-/** Misc info to tuneup VO-driver */
-typedef struct vo_tune_info_s
-{
- int pitch[3]; /**< Picthes for image lines. Should be 0 if unknown else power of 2 */
-}vo_tune_info_t;
-
/** Request for supported FOURCC by VO-driver */
typedef struct vo_query_fourcc_s
{
@@ -217,7 +211,7 @@
**/
MPXP_Rc (* __FASTCALL__ config)(vo_data_t* vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *);
+ uint32_t format);
/** Control interface
* @param request command. See VOCTRL_** for detail
@@ -253,7 +247,7 @@
extern MPXP_Rc __FASTCALL__ vo_init(vo_data_t* vo,const char *subdevice_name);
extern MPXP_Rc __FASTCALL__ vo_config(vo_data_t* vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *);
+ uint32_t format);
extern uint32_t __FASTCALL__ vo_query_format(vo_data_t* vo,uint32_t* fourcc,unsigned src_w,unsigned src_h);
extern MPXP_Rc vo_reset(vo_data_t* vo);
extern MPXP_Rc vo_fullscreen(vo_data_t* vo);
Modified: mplayerxp/libvo/video_out_internal.h
===================================================================
--- mplayerxp/libvo/video_out_internal.h 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/video_out_internal.h 2012-11-11 10:14:52 UTC (rev 325)
@@ -25,7 +25,7 @@
static MPXP_Rc __FASTCALL__ control(vo_data_t*vo,uint32_t request, any_t*data);
static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *);
+ uint32_t format);
static const vo_info_t* __FASTCALL__ get_info(vo_data_t*vo);
static void __FASTCALL__ select_frame(vo_data_t*vo,unsigned idx);
static void __FASTCALL__ uninit(vo_data_t*vo);
Modified: mplayerxp/libvo/vo_dga.c
===================================================================
--- mplayerxp/libvo/vo_dga.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_dga.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -187,23 +187,23 @@
return 0;
}
-static char * __FASTCALL__ vd_GetModeString(int index){
+static char * __FASTCALL__ vd_GetModeString(int _index){
#define VO_DGA_MAX_STRING_LEN 100
static char stringbuf[VO_DGA_MAX_STRING_LEN];
stringbuf[VO_DGA_MAX_STRING_LEN-1]=0;
snprintf(stringbuf, VO_DGA_MAX_STRING_LEN-2,
"depth=%d, bpp=%d, r=%06x, g=%06x, b=%06x, %s (-bpp %d)",
- vo_dga_modes[index].vdm_depth,
- vo_dga_modes[index].vdm_bitspp,
- vo_dga_modes[index].vdm_rmask,
- vo_dga_modes[index].vdm_gmask,
- vo_dga_modes[index].vdm_bmask,
- vo_dga_modes[index].vdm_supported ?
- (vo_dga_modes[index].vdm_conversion_func == VDM_CONV_NATIVE ?
+ vo_dga_modes[_index].vdm_depth,
+ vo_dga_modes[_index].vdm_bitspp,
+ vo_dga_modes[_index].vdm_rmask,
+ vo_dga_modes[_index].vdm_gmask,
+ vo_dga_modes[_index].vdm_bmask,
+ vo_dga_modes[_index].vdm_supported ?
+ (vo_dga_modes[_index].vdm_conversion_func == VDM_CONV_NATIVE ?
"native (fast), " : "conversion (slow),") :
"not supported :-( ",
- vo_dga_modes[index].vdm_mplayer_depth);
+ vo_dga_modes[_index].vdm_mplayer_depth);
return stringbuf;
}
@@ -565,9 +565,9 @@
#endif
#endif
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo, uint32_t width, uint32_t height,
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo, uint32_t width,uint32_t height,
uint32_t d_width,uint32_t d_height,
- uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info )
+ uint32_t flags,char *title,uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
unsigned wanted_width, wanted_height;
@@ -577,7 +577,6 @@
unsigned mX,mY;
UNUSED(title);
- UNUSED(info);
if( priv->is_running ) return MPXP_False;
priv->src_format = format;
Modified: mplayerxp/libvo/vo_fbdev.c
===================================================================
--- mplayerxp/libvo/vo_fbdev.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_fbdev.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -827,7 +827,7 @@
static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
- uint32_t format,const vo_tune_info_t *info)
+ uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
struct fb_cmap *cmap;
@@ -997,7 +997,7 @@
if(vidix_name) {
if(vidix_init(vo,width,height,x_offset,y_offset,priv->out_width,
priv->out_height,format,priv->bpp,
- priv->xres,priv->yres,info) != MPXP_Ok) {
+ priv->xres,priv->yres) != MPXP_Ok) {
MSG_ERR(FBDEV "Can't initialize VIDIX driver\n");
vidix_name = NULL;
vidix_term(vo);
Modified: mplayerxp/libvo/vo_null.c
===================================================================
--- mplayerxp/libvo/vo_null.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_null.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -62,7 +62,7 @@
UNUSED(idx);
}
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
unsigned awidth;
@@ -76,44 +76,6 @@
UNUSED(fullscreen);
UNUSED(title);
priv->pitch_y=priv->pitch_u=priv->pitch_v=1;
- if(info) {
- switch(((const vo_tune_info_t *)info)->pitch[0]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->pitch_y = ((const vo_tune_info_t *)info)->pitch[0];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[1]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->pitch_u = ((const vo_tune_info_t *)info)->pitch[1];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[2]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->pitch_v = ((const vo_tune_info_t *)info)->pitch[2];
- break;
- default: break;
- }
- }
priv->offset_y=priv->offset_u=priv->offset_v=0;
switch(format) {
case IMGFMT_Y800:
Modified: mplayerxp/libvo/vo_opengl.c
===================================================================
--- mplayerxp/libvo/vo_opengl.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_opengl.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -153,7 +153,7 @@
/* connect to server, create and map window,
* allocate colors and (shared) memory
*/
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
int is_bgr;
@@ -164,7 +164,6 @@
XSetWindowAttributes xswa;
unsigned long xswamask,i;
- UNUSED(info);
aspect_save_orig(width,height);
aspect_save_prescale(d_width,d_height);
Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_sdl.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -202,84 +202,40 @@
#define SDL_SRF_UNLOCK(srf)
#endif
-/** Private SDL Data structure **/
+typedef enum {
+ YUV=0,
+ RGB,
+ BGR,
+ GL
+}sdl_mode_e;
+/** Private SDL Data structure **/
typedef struct priv_s {
-
- /* output driver used by sdl */
- char driver[8];
-
- /* SDL display surface */
- SDL_Surface *surface;
-
- /* SDL RGB surface */
- SDL_Surface *rgbsurface[MAX_DRI_BUFFERS];
-
- /* SDL YUV overlay */
- SDL_Overlay *overlay[MAX_DRI_BUFFERS];
-
- /* XP related indexes */
- unsigned num_buffs;
-
- /* available fullscreen modes */
- SDL_Rect **fullmodes;
-
- /* surface attributes for fullscreen and windowed mode */
- Uint32 sdlflags, sdlfullflags;
-
- /* save the windowed output extents */
- SDL_Rect windowsize;
-
- /* Bits per Pixel */
- Uint8 bpp;
-
- /* RGB or YUV? */
-#define YUV 0
-#define RGB 1
-#define BGR 2
-#define GL 3
- Uint8 mode;
-
- /* current fullscreen mode, 0 = highest available fullscreen mode */
- int fullmode;
-
- /* Flip image */
- int flip;
-
- /* fullscreen behaviour; see init */
- int fulltype;
-
- /* is X running (0/1) */
- int X;
-
- /* X11 Resolution */
- int XWidth, XHeight;
-
- /* original image dimensions */
- int width, height;
-
- /* destination dimensions */
- int dstwidth, dstheight;
-
- /* Draw image at coordinate y on the SDL surfaces */
- int y;
-
- /* The image is displayed between those y coordinates in priv->surface */
- int y_screen_top, y_screen_bottom;
-
- /* 1 if the OSD has changed otherwise 0 */
- int osd_has_changed;
-
- /* source image format (YUV/RGB/...) */
- uint32_t format;
-
+ char driver[8]; /* output driver used by sdl */
+ SDL_Surface*surface; /* SDL display surface */
+ SDL_Surface*rgbsurface[MAX_DRI_BUFFERS]; /* SDL RGB surface */
+ SDL_Overlay*overlay[MAX_DRI_BUFFERS]; /* SDL YUV overlay */
+ unsigned num_buffs; /* XP related indexes */
+ SDL_Rect** fullmodes; /* available fullscreen modes */
+ Uint32 sdlflags, sdlfullflags; /* surface attributes for fullscreen and windowed mode */
+ SDL_Rect windowsize; /* save the windowed output extents */
+ Uint8 bpp; /* Bits per Pixel */
+ sdl_mode_e mode; /* RGB or YUV? */
+ int fullmode; /* current fullscreen mode, 0 = highest available fullscreen mode */
+ int flip; /* Flip image */
+ int fulltype; /* fullscreen behaviour; see init */
+ int X; /* is X running (0/1) */
+ int XWidth, XHeight; /* X11 Resolution */
+ int width, height; /* original image dimensions */
+ int dstwidth, dstheight; /* destination dimensions */
+ int y; /* Draw image at coordinate y on the SDL surfaces */
+ int y_screen_top, y_screen_bottom; /* The image is displayed between those y coordinates in priv->surface */
+ int osd_has_changed; /* 1 if the OSD has changed otherwise 0 */
+ uint32_t format; /* source image format (YUV/RGB/...) */
/* dirty_off_frame[0] contains a bounding box around the osd contents drawn above the image
dirty_off_frame[1] is the corresponding thing for OSD contents drawn below the image
*/
- SDL_Rect dirty_off_frame[2];
-
- /* stride info from video decoder */
- const vo_tune_info_t *info;
+ SDL_Rect dirty_off_frame[2];
}priv_t;
static void __FASTCALL__ erase_area_4(int x_start, int width, int height, int pitch, uint32_t color, uint8_t* pixels);
@@ -565,14 +521,12 @@
* returns : non-zero on success, zero on error.
**/
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
//static int sdl_setup (int width, int height)
{
priv_t *priv = vo->priv;
MPXP_Rc retval;
- UNUSED(info);
- priv->info=info;
if(sdl_forcegl) priv->mode = GL;
else
switch(format){
@@ -749,7 +703,7 @@
else {
if(vidix_init(vo,priv->width,priv->height,0,priv->y,
priv->dstwidth,priv->dstheight,priv->format,priv->bpp,
- priv->XWidth,priv->XHeight,priv->info) != MPXP_Ok) {
+ priv->XWidth,priv->XHeight) != MPXP_Ok) {
MSG_ERR("vo_sdl: Can't initialize VIDIX driver\n");
vidix_name = NULL;
return MPXP_False;
Modified: mplayerxp/libvo/vo_vesa.c
===================================================================
--- mplayerxp/libvo/vo_vesa.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_vesa.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -397,7 +397,7 @@
* bit 2 (0x04) enables software scaling (-zoom)
* bit 3 (0x08) enables flipping (-flip) (NK: and for what?)
*/
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
struct VbeInfoBlock vib;
@@ -664,7 +664,7 @@
if(priv->vidix_name) {
if(vidix_init(vo,width,height,priv->x_offset,priv->y_offset,priv->dstW,
priv->dstH,format,priv->dstBpp,
- priv->vmode_info.XResolution,priv->vmode_info.YResolution,info) != MPXP_Ok) {
+ priv->vmode_info.XResolution,priv->vmode_info.YResolution) != MPXP_Ok) {
MSG_ERR("vo_vesa: Can't initialize VIDIX driver\n");
priv->vidix_name = NULL;
vesa_term(vo);
Modified: mplayerxp/libvo/vo_x11.c
===================================================================
--- mplayerxp/libvo/vo_x11.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_x11.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -111,7 +111,7 @@
return ret;
}
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format)
{
priv_t* priv=(priv_t*)vo->priv;
// int interval, prefer_blank, allow_exp, nothing;
@@ -124,8 +124,6 @@
unsigned long xswamask;
unsigned i;
- UNUSED(info);
-
priv->num_buffers=vo_conf.xp_buffs;
if (!title)
Modified: mplayerxp/libvo/vo_xv.c
===================================================================
--- mplayerxp/libvo/vo_xv.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_xv.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -261,7 +261,7 @@
* connect to server, create and map window,
* allocate colors and (shared) memory
*/
-static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
// int screen;
@@ -275,7 +275,6 @@
XSetWindowAttributes xswa;
unsigned long xswamask,i;
- UNUSED(info);
aspect_save_orig(width,height);
aspect_save_prescale(d_width,d_height);
Modified: mplayerxp/libvo/vo_xvidix.c
===================================================================
--- mplayerxp/libvo/vo_xvidix.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vo_xvidix.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -47,8 +47,6 @@
""
};
-#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
-
typedef struct priv_s {
/* Image parameters */
uint32_t image_width;
@@ -67,10 +65,9 @@
uint32_t fgColor;
/* VIDIX related */
char * name;
- vo_tune_info_t vtune;
}priv_t;
-static uint32_t __FASTCALL__ set_window(vo_data_t*vo,int force_update,const vo_tune_info_t *info)
+static uint32_t __FASTCALL__ set_window(vo_data_t*vo,int force_update)
{
priv_t*priv=(priv_t*)vo->priv;
uint32_t retval=0;
@@ -132,7 +129,7 @@
vidix_stop(vo);
if (vidix_init(vo,priv->image_width, priv->image_height, priv->win_x, priv->win_y,
priv->win_w, priv->win_h, priv->image_format, vo->depthonscreen,
- vo_conf.screenwidth, vo_conf.screenheight,info) != MPXP_Ok)
+ vo_conf.screenwidth, vo_conf.screenheight) != MPXP_Ok)
{
MSG_FATAL( "Can't initialize VIDIX driver: %s: %s\n",
priv->name, strerror(errno));
@@ -164,7 +161,7 @@
* allocate colors and (shared) memory
*/
static MPXP_Rc __FASTCALL__ config(vo_data_t*vo,uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
priv_t*priv=(priv_t*)vo->priv;
XVisualInfo vinfo;
@@ -341,9 +338,7 @@
#endif
}
- set_window(vo,1,info);
- if(info) memcpy(&priv->vtune,info,sizeof(vo_tune_info_t));
- else memset(&priv->vtune,0,sizeof(vo_tune_info_t));
+ set_window(vo,1);
XFlush(vo->mDisplay);
XSync(vo->mDisplay, False);
@@ -362,8 +357,7 @@
{
priv_t*priv=(priv_t*)vo->priv;
uint32_t event = vo_x11_check_events(vo,vo->mDisplay,adjust_size);
- if((event & VO_EVENT_RESIZE))
- event = set_window(vo,0,&priv->vtune);
+ if((event & VO_EVENT_RESIZE)) event = set_window(vo,0);
return event;
}
Modified: mplayerxp/libvo/vosub_vidix.c
===================================================================
--- mplayerxp/libvo/vosub_vidix.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vosub_vidix.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -321,22 +321,23 @@
int munlock(const any_t*addr,size_t len) { return ENOSYS; }
#endif
-#define ALLOC_VIDIX_STRUCTS()\
-{\
- if(!priv->cap) priv->cap = vdlAllocCapabilityS();\
- if(!priv->play) priv->play = vdlAllocPlaybackS();\
- if(!priv->fourcc) priv->fourcc = vdlAllocFourccS();\
- if(!priv->dstrides) priv->dstrides = vdlAllocYUVS();\
- if(!(priv->cap && priv->play && priv->fourcc && priv->dstrides)) {\
- MSG_FATAL("Can not alloc certain structures\n");\
- return -1;\
- }\
+static MPXP_Rc alloc_vidix_structs(any_t* ctx) {
+ priv_t* priv=(priv_t*)ctx;
+ if(!priv->cap) priv->cap = vdlAllocCapabilityS();
+ if(!priv->play) priv->play = vdlAllocPlaybackS();
+ if(!priv->fourcc) priv->fourcc = vdlAllocFourccS();
+ if(!priv->dstrides) priv->dstrides = vdlAllocYUVS();
+ if(!(priv->cap && priv->play && priv->fourcc && priv->dstrides)) {
+ MSG_FATAL("Can not alloc certain structures\n");
+ return MPXP_False;
+ }
+ return MPXP_Ok;
}
MPXP_Rc __FASTCALL__ vidix_init(vo_data_t* vo,unsigned src_width,unsigned src_height,
unsigned x_org,unsigned y_org,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp,
- unsigned vid_w,unsigned vid_h,const any_t*info)
+ unsigned vid_w,unsigned vid_h)
{
priv_t*priv=(priv_t*)vo->priv3;
size_t i;
@@ -407,44 +408,6 @@
priv->play->num_frames=(vo_conf.use_bm!=1)?NUM_FRAMES-1:1;
if(priv->play->num_frames > vo_conf.xp_buffs) priv->play->num_frames = vo_conf.xp_buffs;
priv->play->src.pitch.y = priv->play->src.pitch.u = priv->play->src.pitch.v = 0;
- if(info) {
- switch(((const vo_tune_info_t *)info)->pitch[0]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->play->src.pitch.y = ((const vo_tune_info_t *)info)->pitch[0];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[1]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->play->src.pitch.u = ((const vo_tune_info_t *)info)->pitch[1];
- break;
- default: break;
- }
- switch(((const vo_tune_info_t *)info)->pitch[2]) {
- case 2:
- case 4:
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256: priv->play->src.pitch.v = ((const vo_tune_info_t *)info)->pitch[2];
- break;
- default: break;
- }
- }
if((err=vdlConfigPlayback(priv->handler,priv->play))!=0) {
MSG_FATAL("Can't configure playback: %s\n",strerror(err));
return MPXP_False;
@@ -620,7 +583,7 @@
MSG_DBG2("vidix_preinit(%s) was called\n",drvname);
priv_t* priv=mp_mallocz(sizeof(priv_t));
vo->priv3=priv;
- ALLOC_VIDIX_STRUCTS()
+ if(alloc_vidix_structs(priv)!=MPXP_Ok) return MPXP_False;
if(vdlGetVersion() != VIDIX_VERSION) {
MSG_FATAL("You have wrong version of VIDIX library\n");
mp_free(priv);
Modified: mplayerxp/libvo/vosub_vidix.h
===================================================================
--- mplayerxp/libvo/vosub_vidix.h 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/libvo/vosub_vidix.h 2012-11-11 10:14:52 UTC (rev 325)
@@ -18,7 +18,7 @@
MPXP_Rc __FASTCALL__ vidix_init(vo_data_t*,unsigned src_width,unsigned src_height,
unsigned dest_x,unsigned dest_y,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp,
- unsigned vid_w,unsigned vid_h,const any_t*info);
+ unsigned vid_w,unsigned vid_h);
int vidix_start(vo_data_t*);
int vidix_stop(vo_data_t*);
void vidix_term(vo_data_t*);
Modified: mplayerxp/postproc/vf.c
===================================================================
--- mplayerxp/postproc/vf.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -364,7 +364,7 @@
int __FASTCALL__ vf_next_config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int voflags, unsigned int outfmt, any_t*tune){
+ unsigned int voflags, unsigned int outfmt){
int miss;
int flags=vf_next_query_format(vf,outfmt,d_width,d_height);
vf->dw=width;
@@ -394,7 +394,7 @@
vf->next=vf2;
}
vf_showlist(vf);
- return vf->next->config(vf->next,width,height,d_width,d_height,voflags,outfmt,tune);
+ return vf->next->config(vf->next,width,height,d_width,d_height,voflags,outfmt);
}
int __FASTCALL__ vf_next_control(struct vf_instance_s* vf, int request, any_t* data){
@@ -617,7 +617,7 @@
if(vf_scaler->config(vf_scaler,sw,sh,
w,h,
VOFLAG_SWSCALE,
- sfourcc,NULL)==0){
+ sfourcc)==0){
MSG_WARN(MSGTR_CannotInitVO);
vf_scaler=NULL;
}
Modified: mplayerxp/postproc/vf.h
===================================================================
--- mplayerxp/postproc/vf.h 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf.h 2012-11-11 10:14:52 UTC (rev 325)
@@ -35,7 +35,7 @@
// funcs:
int (* __FASTCALL__ config)(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune);
+ unsigned int flags, unsigned int outfmt);
MPXP_Rc (* __FASTCALL__ control)(struct vf_instance_s* vf,
int request, any_t* data);
int (* __FASTCALL__ query_format)(struct vf_instance_s* vf,
@@ -114,7 +114,7 @@
// default wrappers:
int __FASTCALL__ vf_next_config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune);
+ unsigned int flags, unsigned int outfmt);
MPXP_Rc __FASTCALL__ vf_next_control(struct vf_instance_s* vf, int request, any_t* data);
int __FASTCALL__ vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt,unsigned w,unsigned h);
int __FASTCALL__ vf_next_put_slice(struct vf_instance_s* vf,mp_image_t *mpi);
Modified: mplayerxp/postproc/vf_1bpp.c
===================================================================
--- mplayerxp/postproc/vf_1bpp.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_1bpp.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -28,7 +28,7 @@
IMGFMT_IYUV,
IMGFMT_422P,
IMGFMT_444P,
-
+
IMGFMT_YUY2,
IMGFMT_BGR15,
IMGFMT_RGB15,
@@ -65,7 +65,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
if (!vf->priv->fmt)
vf->priv->fmt=find_best(vf,d_width,d_height);
if(!vf->priv->fmt){
@@ -74,7 +74,7 @@
else if(outfmt==IMGFMT_BGR8) vf->priv->fmt=IMGFMT_BGR32;
else return 0;
}
- return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
static int bittab[8]={128,64,32,16,8,4,2,1};
Modified: mplayerxp/postproc/vf_2xsai.c
===================================================================
--- mplayerxp/postproc/vf_2xsai.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_2xsai.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -271,11 +271,11 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt, any_t*tune){
+ unsigned int flags, unsigned int outfmt){
Init_2xSaI(outfmt&255);
- return vf_next_config(vf,2*width,2*height,2*d_width,2*d_height,flags,outfmt,tune);
+ return vf_next_config(vf,2*width,2*height,2*d_width,2*d_height,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_aspect.c
===================================================================
--- mplayerxp/postproc/vf_aspect.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_aspect.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -18,7 +18,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune)
+ unsigned int flags, unsigned int outfmt)
{
if(vf->priv->aspect==768.)
{
@@ -37,7 +37,7 @@
d_width = width;
}
}
- return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt, tune);
+ return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt);
}
static MPXP_Rc __FASTCALL__ vf_open(vf_instance_t *vf,const char* args)
Modified: mplayerxp/postproc/vf_delogo.c
===================================================================
--- mplayerxp/postproc/vf_delogo.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_delogo.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -125,9 +125,9 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
Modified: mplayerxp/postproc/vf_denoise3d.c
===================================================================
--- mplayerxp/postproc/vf_denoise3d.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_denoise3d.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -57,14 +57,14 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
uninit(vf);
vf->priv->Line = mp_malloc(width*sizeof(int));
vf->priv->pmpi=NULL;
// vf->default_caps &= !VFCAP_ACCEPT_STRIDE;
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
#define LowPass(Prev, Curr, Coef) (Curr + Coef[Prev - Curr])
Modified: mplayerxp/postproc/vf_dint.c
===================================================================
--- mplayerxp/postproc/vf_dint.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_dint.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -34,9 +34,9 @@
static int __FASTCALL__ kd_config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
@@ -297,7 +297,7 @@
static int __FASTCALL__ config (struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune)
+ unsigned int flags, unsigned int outfmt)
{
int rowsize;
@@ -326,7 +326,7 @@
vf->priv->diff = 31;
// vf->priv->rdfr = vf->priv->dfr = 0;
vf->priv->was_dint = 0;
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int __FASTCALL__ put_slice (struct vf_instance_s* vf, mp_image_t *mpi)
Modified: mplayerxp/postproc/vf_down3dright.c
===================================================================
--- mplayerxp/postproc/vf_down3dright.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_down3dright.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -105,11 +105,11 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune)
+ unsigned int flags, unsigned int outfmt)
{
/* FIXME - also support UYVY output? */
return vf_next_config(vf, width * vf->priv->scalew,
- height / vf->priv->scaleh - vf->priv->skipline, d_width, d_height, flags, IMGFMT_YV12, tune);
+ height / vf->priv->scaleh - vf->priv->skipline, d_width, d_height, flags, IMGFMT_YV12);
}
Modified: mplayerxp/postproc/vf_eq.c
===================================================================
--- mplayerxp/postproc/vf_eq.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_eq.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -121,7 +121,7 @@
int pel;
short brvec[4];
short contvec[4];
-
+
// printf("\nmmx: src=%p dst=%p w=%d h=%d ds=%d ss=%d\n",src,dst,w,h,dstride,sstride);
contrast = (int) (par->c * 256 * 16);
Modified: mplayerxp/postproc/vf_expand.c
===================================================================
--- mplayerxp/postproc/vf_expand.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_expand.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -34,7 +34,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
unsigned h,dh;
vf->priv->w=width;
vf->priv->h=height;
@@ -42,7 +42,7 @@
vf->priv->dn_h=vf->priv->up_h=(get_osd_height(vo_data,OSD_PB_START,0)*4)/3;
h=height+vf->priv->up_h+vf->priv->dn_h;
dh=d_height+vf->priv->up_h+vf->priv->dn_h;
- return vf_next_config(vf,width,h,d_width,dh,flags,outfmt,tune);
+ return vf_next_config(vf,width,h,d_width,dh,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_flip.c
===================================================================
--- mplayerxp/postproc/vf_flip.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_flip.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#include "config.h"
+#include "mp_config.h"
#include "pp_msg.h"
#include "xmpcore/mp_image.h"
@@ -32,9 +32,9 @@
static int __FASTCALL__ config(struct vf_instance_s *vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
flags&=~VOFLAG_FLIPPING; // remove the FLIP flag
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s *vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_format.c
===================================================================
--- mplayerxp/postproc/vf_format.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_format.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -32,8 +32,8 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ unsigned int flags, unsigned int outfmt){
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static uint32_t get_format(const char *args)
Modified: mplayerxp/postproc/vf_menu.c
===================================================================
--- mplayerxp/postproc/vf_menu.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_menu.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -224,7 +224,7 @@
}
static int __FASTCALL__ config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune) {
+ unsigned int flags, unsigned int outfmt) {
#ifdef HAVE_FREETYPE
// here is the right place to get screen dimensions
if (force_load_font) {
@@ -233,7 +233,7 @@
}
#endif
if(outfmt == IMGFMT_MPEGPES) vf->priv->passthrough = 1;
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int __FASTCALL__ query_format(struct vf_instance_s* vf, unsigned int fmt,unsigned w,unsigned h){
Modified: mplayerxp/postproc/vf_mirror.c
===================================================================
--- mplayerxp/postproc/vf_mirror.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_mirror.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -89,10 +89,10 @@
//===========================================================================//
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
vf->priv->dw=width;
vf->priv->dh=height;
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_noise.c
===================================================================
--- mplayerxp/postproc/vf_noise.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_noise.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -318,9 +318,9 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static void __FASTCALL__ get_image(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_ow.c
===================================================================
--- mplayerxp/postproc/vf_ow.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_ow.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -204,7 +204,7 @@
// printf("%f\n", sum/height/width);
}
-static int __FASTCALL__ config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt, any_t*tune){
+static int __FASTCALL__ config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){
int h= (height+15)&(~15);
int i,j;
@@ -213,8 +213,7 @@
for(i=0; i<=vf->priv->depth; i++)
vf->priv->plane[i][j]= mp_malloc(vf->priv->stride*h*sizeof(vf->priv->plane[0][0][0]));
}
-
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static void __FASTCALL__ get_image(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_palette.c
===================================================================
--- mplayerxp/postproc/vf_palette.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_palette.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -62,7 +62,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
if (!vf->priv->fmt)
vf->priv->fmt=find_best(vf,outfmt,d_width,d_height);
if(!vf->priv->fmt){
@@ -71,7 +71,7 @@
else if(outfmt==IMGFMT_BGR8) vf->priv->fmt=IMGFMT_BGR32;
else return 0;
}
- return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_panscan.c
===================================================================
--- mplayerxp/postproc/vf_panscan.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_panscan.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -34,7 +34,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
unsigned w,h,d_w,d_h;
vf->priv->org_w=width;
vf->priv->org_h=height;
@@ -82,7 +82,7 @@
}
vf->priv->fmt=outfmt;
MSG_DBG2("w,h=%i %i org_w,h=%i %i\n",w,h,vf->priv->org_w,vf->priv->org_h);
- return vf_next_config(vf,w,h,d_w,d_h,flags,outfmt,tune);
+ return vf_next_config(vf,w,h,d_w,d_h,flags,outfmt);
}
@@ -219,7 +219,7 @@
//===========================================================================//
static int __FASTCALL__ crop_config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
unsigned w,h,d_w,d_h;
vf->priv->org_w=width;
vf->priv->org_h=height;
@@ -248,7 +248,7 @@
}
d_w=(float)d_width*vf->priv->ps_w/width;
d_h=(float)d_height*vf->priv->ps_h/height;
- return vf_next_config(vf,w,h,d_w,d_h,flags,outfmt,tune);
+ return vf_next_config(vf,w,h,d_w,d_h,flags,outfmt);
}
static MPXP_Rc __FASTCALL__ vf_crop_open(vf_instance_t *vf,const char* args){
Modified: mplayerxp/postproc/vf_perspective.c
===================================================================
--- mplayerxp/postproc/vf_perspective.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_perspective.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -100,7 +100,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
int i, j;
vf->priv->pvStride= width;
@@ -122,7 +122,7 @@
vf->priv->coeff[i][j]= (int)floor((1<<COEFF_BITS)*temp[j]/sum + 0.5);
}
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static void __FASTCALL__ uninit(struct vf_instance_s* vf){
Modified: mplayerxp/postproc/vf_pp.c
===================================================================
--- mplayerxp/postproc/vf_pp.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_pp.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -26,7 +26,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int voflags, unsigned int outfmt,any_t*tune){
+ unsigned int voflags, unsigned int outfmt){
int flags=
(gCpuCaps.hasMMX ? PP_CPU_CAPS_MMX : 0)
| (gCpuCaps.hasMMX2 ? PP_CPU_CAPS_MMX2 : 0)
@@ -42,7 +42,7 @@
if(vf->priv->context) pp_free_context(vf->priv->context);
vf->priv->context= pp2_get_context(width, height, flags);
- return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt);
}
static void __FASTCALL__ uninit(struct vf_instance_s* vf){
Modified: mplayerxp/postproc/vf_raw.c
===================================================================
--- mplayerxp/postproc/vf_raw.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_raw.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -25,8 +25,8 @@
//===========================================================================//
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ unsigned int flags, unsigned int outfmt){
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_rectangle.c
===================================================================
--- mplayerxp/postproc/vf_rectangle.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_rectangle.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -14,7 +14,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune)
+ unsigned int flags, unsigned int outfmt)
{
if (vf->priv->w < 0 || width < vf->priv->w)
vf->priv->w = width;
@@ -29,7 +29,7 @@
MSG_WARN("rectangle: bad position/width/height - rectangle area is out of the original!\n");
return 0;
}
- return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt,tune);
+ return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt);
}
static MPXP_Rc __FASTCALL__ control(struct vf_instance_s* vf, int request, any_t*data)
Modified: mplayerxp/postproc/vf_rgb2bgr.c
===================================================================
--- mplayerxp/postproc/vf_rgb2bgr.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_rgb2bgr.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -40,9 +40,9 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
vf->priv->fmt=getfmt(outfmt,vf->priv->forced);
- return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
#define rgb32tobgr32(a,b,c) shuffle_bytes_3210(a,b,c)
Modified: mplayerxp/postproc/vf_rotate.c
===================================================================
--- mplayerxp/postproc/vf_rotate.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_rotate.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -115,13 +115,13 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
vf->priv->dw=width;
vf->priv->dh=height;
if(vf->priv->direction==180)
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt,tune);
+ return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
else
- return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt,tune);
+ return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt);
}
static int __FASTCALL__ put_slice(struct vf_instance_s* vf, mp_image_t *mpi){
Modified: mplayerxp/postproc/vf_scale.c
===================================================================
--- mplayerxp/postproc/vf_scale.c 2012-11-10 17:01:29 UTC (rev 324)
+++ mplayerxp/postproc/vf_scale.c 2012-11-11 10:14:52 UTC (rev 325)
@@ -130,7 +130,7 @@
static int __FASTCALL__ config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt,any_t*tune){
+ unsigned int flags, unsigned int outfmt){
unsigned int best=find_best_out(vf,d_width,d_height);
int vo_flags;
int int_sws_flags=0;
@@ -303,7 +303,7 @@
//d_width=d_width*vf->priv->w/width;
//d_height=d_height*vf->priv->h/height;
}
- return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best,tune);
+ return vf_next_config(vf,vf...
[truncated message content] |
