changeset 4468:76fb5d33e6eb

printing correct format info
author michael
date Fri, 01 Feb 2002 19:39:37 +0000
parents 9512d6832b38
children ac00b30ac80f
files postproc/swscale.c
diffstat 1 files changed, 11 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/postproc/swscale.c	Fri Feb 01 19:25:09 2002 +0000
+++ b/postproc/swscale.c	Fri Feb 01 19:39:37 2002 +0000
@@ -1275,36 +1275,26 @@
 		char *dither= "";
 #endif
 		if(flags&SWS_FAST_BILINEAR)
-			fprintf(stderr, "\nSwScaler: FAST_BILINEAR scaler ");
+			fprintf(stderr, "\nSwScaler: FAST_BILINEAR scaler, ");
 		else if(flags&SWS_BILINEAR)
-			fprintf(stderr, "\nSwScaler: BILINEAR scaler ");
+			fprintf(stderr, "\nSwScaler: BILINEAR scaler, ");
 		else if(flags&SWS_BICUBIC)
-			fprintf(stderr, "\nSwScaler: BICUBIC scaler ");
+			fprintf(stderr, "\nSwScaler: BICUBIC scaler, ");
 		else if(flags&SWS_X)
-			fprintf(stderr, "\nSwScaler: Experimental scaler ");
+			fprintf(stderr, "\nSwScaler: Experimental scaler, ");
 		else if(flags&SWS_POINT)
-			fprintf(stderr, "\nSwScaler: Nearest Neighbor / POINT scaler ");
+			fprintf(stderr, "\nSwScaler: Nearest Neighbor / POINT scaler, ");
 		else if(flags&SWS_AREA)
-			fprintf(stderr, "\nSwScaler: Area Averageing scaler ");
+			fprintf(stderr, "\nSwScaler: Area Averageing scaler, ");
 		else
 			fprintf(stderr, "\nSwScaler: ehh flags invalid?! ");
 
-		if(dstFormat==IMGFMT_BGR15)
-			fprintf(stderr, "with%s BGR15 output ", dither);
-		else if(dstFormat==IMGFMT_BGR16)
-			fprintf(stderr, "with%s BGR16 output ", dither);
-		else if(dstFormat==IMGFMT_BGR24)
-			fprintf(stderr, "with BGR24 output ");
-		else if(dstFormat==IMGFMT_BGR32)
-			fprintf(stderr, "with BGR32 output ");
-		else if(dstFormat==IMGFMT_YV12)
-			fprintf(stderr, "with YV12 output ");
-		else if(dstFormat==IMGFMT_I420)
-			fprintf(stderr, "with I420 output ");
-		else if(dstFormat==IMGFMT_IYUV)
-			fprintf(stderr, "with IYUV output ");
+		if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16)
+			fprintf(stderr, "from %s to%s %s ", 
+				vo_format_name(srcFormat), dither, vo_format_name(dstFormat));
 		else
-			fprintf(stderr, "without output ");
+			fprintf(stderr, "from %s to %s ", 
+				vo_format_name(srcFormat), vo_format_name(dstFormat));
 
 		if(cpuCaps.hasMMX2)
 			fprintf(stderr, "using MMX2\n");