[MPlayer-cvslog] r18815 - in trunk: help/help_mp-en.h libvo/mga_common.c

[attila]

Author: attila
Date: Sun Jun 25 17:50:19 2006
New Revision: 18815

Modified:
   trunk/help/help_mp-en.h
   trunk/libvo/mga_common.c

Log:
fail with an error if the source resolution is larger than 1023x1023
when using -vo (x)mga


Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	(original)
+++ trunk/help/help_mp-en.h	Sun Jun 25 17:50:19 2006
@@ -1579,6 +1579,7 @@
 #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "Your mga_vid driver version is incompatible with this MPlayer version!\n"
 #define MSGTR_LIBVO_MGA_UsingBuffers "Using %d buffers.\n"
 #define MSGTR_LIBVO_MGA_CouldntOpen "Couldn't open: %s\n"
+#define MGSTR_LIBVO_MGA_ResolutionTooHigh "Source resolution is in at least one dimension larger than 1023x1023. Please rescale in software or use -lavdopts lowres=1\n"
 
 // libvo/vesa_lvo.c
 

Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c	(original)
+++ trunk/libvo/mga_common.c	Sun Jun 25 17:50:19 2006
@@ -371,6 +371,12 @@
             return (-1);
         }
 
+	if(width>1023 || height >1024)
+	{
+		mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh);
+		return (-1);
+	}
+
 	mga_vid_config.src_width = width;
 	mga_vid_config.src_height= height;
 	if(!mga_vid_config.dest_width)