From d192ac3e03d1ebdb671f22b290da577d19f3e156 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 11 Feb 2013 13:37:29 +0200 Subject: swscale: Disallow conversion to GBRP16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts parts of d6d5ef5534d582, that didn't work right. (The tests that were added failed on big endian, and the output looked garbled on little endian as well.) This is due to the fact that the intermediate scaling values (from e.g. hScale8To19_c or hScale16To19_c) are stored as int32_t and thus requires a separate output function, while yuv2gbrp_full_X_c only interprets it as int16_t. Signed-off-by: Martin Storsjö --- libswscale/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libswscale/utils.c') diff --git a/libswscale/utils.c b/libswscale/utils.c index b216eff63e..6bbdb64f8d 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -168,8 +168,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRP9BE] = { 1, 1 }, [AV_PIX_FMT_GBRP10LE] = { 1, 1 }, [AV_PIX_FMT_GBRP10BE] = { 1, 1 }, - [AV_PIX_FMT_GBRP16LE] = { 1, 1 }, - [AV_PIX_FMT_GBRP16BE] = { 1, 1 }, + [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, + [AV_PIX_FMT_GBRP16BE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) -- cgit v1.2.3