]> git.sesse.net Git - vlc/commitdiff
Don't crash on messed up aspect ratios.
authorSigmund Augdal Helberg <sigmunau@videolan.org>
Wed, 7 Feb 2007 22:06:31 +0000 (22:06 +0000)
committerSigmund Augdal Helberg <sigmunau@videolan.org>
Wed, 7 Feb 2007 22:06:31 +0000 (22:06 +0000)
src/video_output/vout_intf.c

index 5f58542f9ce0e7ff828cdad67c410143567fa177..8e851a80fcf58d4b66518d4bab3e2e395e34ae65 100644 (file)
@@ -858,7 +858,12 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
         goto initwsize_end;
     }
 
-    if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
+    if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) {
+        msg_Warn( p_vout, "fucked up aspect" );
+        *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
+        *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
+    }
+    else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
     {
         *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
             p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );