From d3b98b90f47846a788d11f4bebb5a30a544926e9 Mon Sep 17 00:00:00 2001 From: Johns Date: Fri, 13 Jan 2012 10:04:26 +0100 Subject: [PATCH] Fix bug: devision by zero in ...UpdateOutput, --- video.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/video.c b/video.c index 7c9d3a0..a48222e 100644 --- a/video.c +++ b/video.c @@ -1540,6 +1540,12 @@ static void VaapiUpdateOutput(VaapiDecoder * decoder) decoder->InputWidth * input_aspect_ratio.num, decoder->InputHeight * input_aspect_ratio.den, 1024 * 1024); + // InputWidth/Height can be zero = uninitialized + if (!display_aspect_ratio.num || !display_aspect_ratio.den) { + display_aspect_ratio.num = 1; + display_aspect_ratio.den = 1; + } + Debug(3, "video: aspect %d:%d\n", display_aspect_ratio.num, display_aspect_ratio.den); @@ -3991,7 +3997,7 @@ static void VdpauExitOutputQueue(void) Debug(4, "video/vdpau: destroy output surface with id 0x%08x\n", VdpauSurfacesRb[i]); - if ( VdpauSurfacesRb[i] != VDP_INVALID_HANDLE ) { + if (VdpauSurfacesRb[i] != VDP_INVALID_HANDLE) { status = VdpauOutputSurfaceDestroy(VdpauSurfacesRb[i]); if (status != VDP_STATUS_OK) { Error(_("video/vdpau: can't destroy output surface: %s\n"), @@ -4450,6 +4456,12 @@ static void VdpauUpdateOutput(VdpauDecoder * decoder) decoder->InputWidth * input_aspect_ratio.num, decoder->InputHeight * input_aspect_ratio.den, 1024 * 1024); + // InputWidth/Height can be zero = uninitialized + if (!display_aspect_ratio.num || !display_aspect_ratio.den) { + display_aspect_ratio.num = 1; + display_aspect_ratio.den = 1; + } + Debug(3, "video: aspect %d:%d\n", display_aspect_ratio.num, display_aspect_ratio.den);