From patchwork Tue Apr 4 10:33:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 3283 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp123183vss; Tue, 4 Apr 2017 03:33:54 -0700 (PDT) X-Received: by 10.223.169.210 with SMTP id b76mr21011199wrd.197.1491302034076; Tue, 04 Apr 2017 03:33:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n27si8258878wra.31.2017.04.04.03.33.53; Tue, 04 Apr 2017 03:33:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C10F16882AD; Tue, 4 Apr 2017 13:33:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA39E680D6D for ; Tue, 4 Apr 2017 13:33:42 +0300 (EEST) Received: from [172.31.218.33] (helo=vie01a-dmta-pe01-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1cvLmS-0005uD-3J for ffmpeg-devel@ffmpeg.org; Tue, 04 Apr 2017 12:33:44 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1cvLmM-0004iO-Hz for ffmpeg-devel@ffmpeg.org; Tue, 04 Apr 2017 12:33:38 +0200 Received: from [192.168.1.3] ([80.110.82.247]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 4AZY1v0115LA42Q01AZZDH; Tue, 04 Apr 2017 12:33:33 +0200 X-SourceIP: 80.110.82.247 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 4 Apr 2017 12:33:32 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201704041233.32226.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! I believe attached patch makes FFmpeg a little more consistent with itself. Please comment, Carl Eugen From 5e1239a6bf3d97b360a447bd88da2e0477ffc0c9 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 4 Apr 2017 12:24:41 +0200 Subject: [PATCH] lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16. --- libswscale/utils.c | 4 ++++ libswscale/version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 4c9b53b..17c9967 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1016,6 +1016,10 @@ static int handle_jpeg(enum AVPixelFormat *format) return 1; case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YA8: + case AV_PIX_FMT_GRAY10LE: + case AV_PIX_FMT_GRAY10BE: + case AV_PIX_FMT_GRAY12LE: + case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16LE: case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_YA16BE: diff --git a/libswscale/version.h b/libswscale/version.h index 259ae7a..dcdc85b 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 4 #define LIBSWSCALE_VERSION_MINOR 7 -#define LIBSWSCALE_VERSION_MICRO 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \