]> git.sesse.net Git - vlc/commitdiff
image: filter may fail, don't crash on NULL picture
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 31 Jan 2010 19:31:02 +0000 (21:31 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 31 Jan 2010 19:33:08 +0000 (21:33 +0200)
src/misc/image.c

index 3f7758d85d2b59e1a41a9d53301b5aab1c5ee10d..497d073a183a763264f508301ceec93f668638c9 100644 (file)
@@ -339,9 +339,15 @@ static block_t *ImageWrite( image_handler_t *p_image, picture_t *p_pic,
         p_tmp_pic =
             p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
 
-        p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, p_tmp_pic );
-
-        p_image->p_filter->pf_video_buffer_del( p_image->p_filter, p_tmp_pic );
+        if( likely(p_tmp_pic != NULL) )
+        {
+            p_block = p_image->p_enc->pf_encode_video( p_image->p_enc,
+                                                       p_tmp_pic );
+            p_image->p_filter->pf_video_buffer_del( p_image->p_filter,
+                                                    p_tmp_pic );
+        }
+        else
+            p_block = NULL;
     }
     else
     {