From abac47e04d9a4dd2e850423262c2388f03345d6e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 20 Mar 2017 14:30:16 +0100 Subject: [PATCH] generic-pc/video.cpp dont set output format with negative height size --- generic-pc/video.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 6cd7ec4..208cc57 100644 --- a/generic-pc/video.cpp +++ b/generic-pc/video.cpp @@ -82,6 +82,7 @@ cVideo::cVideo(int, void *, void *, unsigned int) display_aspect = DISPLAY_AR_16_9; display_crop = DISPLAY_AR_MODE_LETTERBOX; v_format = VIDEO_FORMAT_MPEG2; + output_h = 0; } cVideo::~cVideo(void) @@ -98,7 +99,7 @@ int cVideo::setAspectRatio(int vformat, int cropping) display_aspect = (DISPLAY_AR) vformat; if (cropping >= 0) display_crop = (DISPLAY_AR_MODE) cropping; - if (display_aspect < DISPLAY_AR_RAW) /* don't know what to do with this */ + if (display_aspect < DISPLAY_AR_RAW && output_h > 0) /* don't know what to do with this */ glfb->setOutputFormat(aspect_ratios[display_aspect], output_h, display_crop); return 0; } @@ -197,7 +198,7 @@ int cVideo::SetVideoSystem(int system, bool) } v_std = (VIDEO_STD) system; output_h = h; - if (display_aspect < DISPLAY_AR_RAW) /* don't know what to do with this */ + if (display_aspect < DISPLAY_AR_RAW && output_h > 0) /* don't know what to do with this */ glfb->setOutputFormat(aspect_ratios[display_aspect], output_h, display_crop); return 0; }