[FFmpeg-cvslog] r24801 - trunk/ffplay.c

[cehoyos]

Author: cehoyos
Date: Tue Aug 17 09:47:44 2010
New Revision: 24801

Log:
Fix SDL crash on specific hardware.

Patch by Mike Scheutzow, mjs973 optonline net

Modified:
   trunk/ffplay.c

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Tue Aug 17 09:46:09 2010	(r24800)
+++ trunk/ffplay.c	Tue Aug 17 09:47:44 2010	(r24801)
@@ -1373,6 +1373,14 @@ static void alloc_picture(void *opaque)
     vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
                                    SDL_YV12_OVERLAY,
                                    screen);
+    if (!vp->bmp || vp->bmp->pitches[0] < vp->width) {
+        /* SDL allocates a buffer smaller than requested if the video
+         * overlay hardware is unable to support the requested size. */
+        fprintf(stderr, "Error: the video system does not support an image\n"
+                        "size of %dx%d pixels. Try using -vf \"scale=w:h\"\n"
+                        "to reduce the image size.\n", vp->width, vp->height );
+        do_exit();
+    }
 
     SDL_LockMutex(is->pictq_mutex);
     vp->allocated = 1;