Mercurial > mplayer.hg

changeset 17631:b1378adb995f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make swscale-example compile patch by (Alan Curry <pacman TheWorld com>)
author michael
date Thu, 16 Feb 2006 12:52:09 +0000
parents 7c4eef408b6b
children 3a67b7ce8b3b
files postproc/swscale-example.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/postproc/swscale-example.c	Thu Feb 16 10:08:03 2006 +0000
+++ b/postproc/swscale-example.c	Thu Feb 16 12:52:09 2006 +0000
@@ -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++){