diff -bur g2/swscale/swscale-example.c g2.my/swscale/swscale-example.c --- g2/swscale/swscale-example.c Sat May 3 21:35:47 2003 +++ g2.my/swscale/swscale-example.c Mon May 12 18:52:37 2003 @@ -115,8 +115,8 @@ if(ssdY>100 || ssdU>100 || ssdV>100){ printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n", - vo_format_name(srcFormat), srcW, srcH, - vo_format_name(dstFormat), dstW, dstH, + get_imgfmt_name(srcFormat), srcW, srcH, + get_imgfmt_name(dstFormat), dstW, dstH, flags, ssdY, ssdU, ssdV); } @@ -158,8 +158,8 @@ if(!dstFormat) break; // if(!isSupportedOut(dstFormat)) continue; printf("%s -> %s\n", - vo_format_name(srcFormat), - vo_format_name(dstFormat)); + get_imgfmt_name(srcFormat), + get_imgfmt_name(dstFormat)); srcW= w; srcH= h; diff -bur g2/swscale/swscale.c g2.my/swscale/swscale.c --- g2/swscale/swscale.c Sat May 3 21:36:10 2003 +++ g2.my/swscale/swscale.c Mon May 12 18:53:33 2003 @@ -1368,7 +1368,7 @@ case 0x84: conv= rgb16to32; break; case 0x86: conv= rgb24to32; break; default: MSG_ERR("swScaler: internal error %s -> %s converter\n", - vo_format_name(srcFormat), vo_format_name(dstFormat)); break; + get_imgfmt_name(srcFormat), get_imgfmt_name(dstFormat)); break; } }else if( (isBGR(srcFormat) && isRGB(dstFormat)) || (isRGB(srcFormat) && isBGR(dstFormat))){ @@ -1390,11 +1390,11 @@ case 0x86: conv= rgb24tobgr32; break; case 0x88: conv= rgb32tobgr32; break; default: MSG_ERR("swScaler: internal error %s -> %s converter\n", - vo_format_name(srcFormat), vo_format_name(dstFormat)); break; + get_imgfmt_name(srcFormat), get_imgfmt_name(dstFormat)); break; } }else{ MSG_ERR("swScaler: internal error %s -> %s converter\n", - vo_format_name(srcFormat), vo_format_name(dstFormat)); + get_imgfmt_name(srcFormat), get_imgfmt_name(dstFormat)); } if(dstStride[0]*srcBpp == srcStride[0]*dstBpp) @@ -1717,12 +1717,12 @@ if(!isSupportedIn(srcFormat)) { - MSG_ERR("swScaler: %s is not supported as input format\n", vo_format_name(srcFormat)); + MSG_ERR("swScaler: %s is not supported as input format\n", get_imgfmt_name(srcFormat)); return NULL; } if(!isSupportedOut(dstFormat)) { - MSG_ERR("swScaler: %s is not supported as output format\n", vo_format_name(dstFormat)); + MSG_ERR("swScaler: %s is not supported as output format\n", get_imgfmt_name(dstFormat)); return NULL; } @@ -1843,7 +1843,7 @@ if(c->swScale){ if(flags&SWS_PRINT_INFO) MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n", - vo_format_name(srcFormat), vo_format_name(dstFormat)); + get_imgfmt_name(srcFormat), get_imgfmt_name(dstFormat)); return c; } } @@ -1988,10 +1988,10 @@ if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16) MSG_INFO("from %s to%s %s ", - vo_format_name(srcFormat), dither, vo_format_name(dstFormat)); + get_imgfmt_name(srcFormat), dither, get_imgfmt_name(dstFormat)); else MSG_INFO("from %s to %s ", - vo_format_name(srcFormat), vo_format_name(dstFormat)); + get_imgfmt_name(srcFormat), get_imgfmt_name(dstFormat)); if(flags & SWS_CPU_CAPS_MMX2) MSG_INFO("using MMX2\n"); diff -bur g2/video/img_format.c g2.my/video/img_format.c --- g2/video/img_format.c Sun Feb 9 22:28:39 2003 +++ g2.my/video/img_format.c Mon May 12 18:50:30 2003 @@ -1,6 +1,6 @@ #include "img_format.h" -char *vo_format_name(int format) +char *get_imgfmt_name(int format) { switch(format) { diff -bur g2/video/img_format.h g2.my/video/img_format.h --- g2/video/img_format.h Sun Feb 9 22:28:39 2003 +++ g2.my/video/img_format.h Mon May 12 18:50:21 2003 @@ -1,4 +1,3 @@ - #ifndef __IMG_FORMAT_H #define __IMG_FORMAT_H @@ -83,6 +82,6 @@ int timestamp; // pts, 90000 Hz counter based } vo_mpegpes_t; -char *vo_format_name(int format); +char *get_imgfmt_name(int format); #endif diff -bur g2/video/vd.c g2.my/video/vd.c --- g2/video/vd.c Mon May 12 01:48:44 2003 +++ g2.my/video/vd.c Mon May 12 18:52:02 2003 @@ -175,7 +175,7 @@ if(!sh->disp_w || !sh->disp_h) return 0; - mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt)); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,get_imgfmt_name(preferred_outfmt)); // if(!vf) return 1; // temp hack @@ -201,12 +201,12 @@ out_fmt=sh->codec->outfmt[i]; if(out_fmt==(unsigned int)0xFFFFFFFF) continue; flags=vf->query_format(vf,out_fmt); - mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i); + mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",get_imgfmt_name(out_fmt),flags,i); if((flags&2) || (flags && j<0)){ // check (query) if codec really support this outfmt... sh->outfmtidx=j; // pass index to the control() function this way if(sh->dec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE){ - mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: codec query_format(%s) returned FALSE\n",vo_format_name(out_fmt)); + mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: codec query_format(%s) returned FALSE\n",get_imgfmt_name(out_fmt)); continue; } j=i; vo_flags=flags; if(flags&2) break; @@ -253,7 +253,7 @@ return 0; // failed } out_fmt=sh->codec->outfmt[j]; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"VDec: using %s as output csp (no %d)\n",vo_format_name(out_fmt),j); + mp_msg(MSGT_CPLAYER,MSGL_INFO,"VDec: using %s as output csp (no %d)\n",get_imgfmt_name(out_fmt),j); sh->outfmtidx=j; sh->vfilter=vf; diff -bur g2/video/vf.c g2.my/video/vf.c --- g2/video/vf.c Mon May 5 20:46:59 2003 +++ g2.my/video/vf.c Mon May 12 18:51:39 2003 @@ -400,7 +400,7 @@ int ret; if((p=list)) while(*p){ ret=vf->query_format(vf,*p); - mp_msg(MSGT_VFILTER,MSGL_V,"[%s] query(%s) -> %d\n",vf->info->name,vo_format_name(*p),ret&3); + mp_msg(MSGT_VFILTER,MSGL_V,"[%s] query(%s) -> %d\n",vf->info->name,get_imgfmt_name(*p),ret&3); if(ret&2){ best=*p; break;} // no conversion -> bingo! if(ret&1 && !best) best=*p; // best with conversion ++p; @@ -415,7 +415,7 @@ // try the list again, now with "scaler" : if((p=list)) while(*p){ ret=vf->query_format(vf,*p); - mp_msg(MSGT_VFILTER,MSGL_V,"[%s] query(%s) -> %d\n",vf->info->name,vo_format_name(*p),ret&3); + mp_msg(MSGT_VFILTER,MSGL_V,"[%s] query(%s) -> %d\n",vf->info->name,get_imgfmt_name(*p),ret&3); if(ret&2){ best=*p; break;} // no conversion -> bingo! if(ret&1 && !best) best=*p; // best with conversion ++p; diff -bur g2/video/vf_scale.c g2.my/video/vf_scale.c --- g2/video/vf_scale.c Sun May 4 03:20:16 2003 +++ g2.my/video/vf_scale.c Mon May 12 18:51:08 2003 @@ -71,7 +71,7 @@ // find the best outfmt: while(*p){ int ret=vf_next_query_format(vf,*p); - mp_msg(MSGT_VFILTER,MSGL_DBG2,"scale: query(%s) -> %d\n",vo_format_name(*p),ret&3); + mp_msg(MSGT_VFILTER,MSGL_DBG2,"scale: query(%s) -> %d\n",get_imgfmt_name(*p),ret&3); if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ best=*p; break;} // no conversion -> bingo! if(ret&VFCAP_CSP_SUPPORTED && !best) best=*p; // best with conversion ++p; @@ -148,8 +148,8 @@ if(vf->priv->h==0) vf->priv->h=d_height; mp_msg(MSGT_VFILTER,MSGL_DBG2,"SwScale: scaling %dx%d %s to %dx%d %s \n", - width,height,vo_format_name(outfmt), - vf->priv->w,vf->priv->h,vo_format_name(best)); + width,height,get_imgfmt_name(outfmt), + vf->priv->w,vf->priv->h,get_imgfmt_name(best)); // free old ctx: if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); diff -bur g2/video/vf_vo2.c g2.my/video/vf_vo2.c --- g2/video/vf_vo2.c Sat May 10 19:51:58 2003 +++ g2.my/video/vf_vo2.c Mon May 12 18:51:24 2003 @@ -1,4 +1,3 @@ -#include #include #include @@ -54,7 +53,7 @@ mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: %dx%d => %dx%d %s %s%s%s%s\n", width, height, d_width, d_height, - vo_format_name(outfmt), + get_imgfmt_name(outfmt), (flags&1)?" [fs]":"", (flags&2)?" [vm]":"", (flags&4)?" [zoom]":"",