[MPlayer-cvslog] CVS: main/postproc swscale-example.c,1.7,1.8
Michael Niedermayer CVS
syncmail at mplayerhq.hu
Thu Feb 16 13:52:13 CET 2006
CVS change done by Michael Niedermayer CVS
Update of /cvsroot/mplayer/main/postproc
In directory mail:/var2/tmp/cvs-serv17907
Modified Files:
swscale-example.c
Log Message:
make swscale-example compile patch by (Alan Curry <pacman TheWorld com>)
Index: swscale-example.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale-example.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- swscale-example.c 13 Jan 2006 00:23:32 -0000 1.7
+++ swscale-example.c 16 Feb 2006 12:52:09 -0000 1.8
@@ -90,9 +90,9 @@
out[i]= (uint8_t*) malloc(refStride[i]*h);
}
- srcContext= sws_getContext(w, h, IMGFMT_YV12, srcW, srcH, srcFormat, flags, NULL, NULL);
- dstContext= sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, NULL, NULL);
- outContext= sws_getContext(dstW, dstH, dstFormat, w, h, IMGFMT_YV12, flags, NULL, NULL);
+ srcContext= sws_getContext(w, h, IMGFMT_YV12, srcW, srcH, srcFormat, flags, NULL, NULL, NULL);
+ dstContext= sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, NULL, NULL, NULL);
+ outContext= sws_getContext(dstW, dstH, dstFormat, w, h, IMGFMT_YV12, flags, NULL, NULL, NULL);
if(srcContext==NULL ||dstContext==NULL ||outContext==NULL){
printf("Failed allocating swsContext\n");
goto end;
@@ -139,7 +139,7 @@
}
}
-void mp_msg_c( int x, const char *format, ... ){
+void mp_msg( int x, int y, const char *format, ... ){
va_list va;
va_start(va, format);
vfprintf(stderr, format, va);
@@ -192,7 +192,7 @@
int x, y;
struct SwsContext *sws;
- sws= sws_getContext(W/12, H/12, IMGFMT_BGR32, W, H, IMGFMT_YV12, 2, NULL, NULL);
+ sws= sws_getContext(W/12, H/12, IMGFMT_BGR32, W, H, IMGFMT_YV12, 2, NULL, NULL, NULL);
for(y=0; y<H; y++){
for(x=0; x<W*4; x++){
More information about the MPlayer-cvslog
mailing list