From 6efe558f789a2a28ad275393f357675d80d7ae57 Mon Sep 17 00:00:00 2001 From: Johns Date: Mon, 16 Jan 2012 20:20:01 +0100 Subject: [PATCH] Fix bug: transposed digits 567 should be 576. --- ChangeLog | 1 + video.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index be3d639..b765bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ User johns Date: + Fix bug: transposed digits 567 should be 576. Audio module cleanup: Alsa + OSS can be included/build at the same time. Alsa or OSS can be runtime selected with -a. diff --git a/video.c b/video.c index 2d926cf..3674db0 100644 --- a/video.c +++ b/video.c @@ -152,7 +152,7 @@ typedef enum /// typedef enum _video_resolutions_ { - VideoResolution567i, ///< ...x567 interlaced + VideoResolution576i, ///< ...x576 interlaced VideoResolution720p, ///< ...x720 progressive VideoResolutionFake1080i, ///< 1280x1080 1440x1080 interlaced VideoResolution1080i, ///< 1920x1080 interlaced @@ -784,8 +784,8 @@ static VideoResolutions VideoResolutionGroup(int width, int height, __attribute__ ((unused)) int interlace) { - if (height <= 567) { - return VideoResolution567i; + if (height <= 576) { + return VideoResolution576i; } if (height <= 720) { return VideoResolution720p; @@ -1188,7 +1188,7 @@ static void VaapiInitSurfaceFlags(VaapiDecoder * decoder) for (i = 0; i < VideoResolutionMax; ++i) { decoder->SurfaceFlagsTable[i] = VA_CLEAR_DRAWABLE; // color space conversion none, ITU-R BT.601, ITU-R BT.709 - if (i > VideoResolution567i) { + if (i > VideoResolution576i) { decoder->SurfaceFlagsTable[i] |= VA_SRC_BT709; } else { decoder->SurfaceFlagsTable[i] |= VA_SRC_BT601; @@ -1320,7 +1320,6 @@ static void VaapiCleanup(VaapiDecoder * decoder) surface = decoder->SurfacesRb[decoder->SurfaceRead]; if (surface == VA_INVALID_ID) { - printf(_("video/vaapi: invalid surface in ringbuffer\n")); Error(_("video/vaapi: invalid surface in ringbuffer\n")); continue; }