From patchwork Sun Dec 10 13:14:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6660 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1676975jah; Sun, 10 Dec 2017 05:16:51 -0800 (PST) X-Google-Smtp-Source: AGs4zMb57B1hGNH2XUcX0lmItJJhvGsRNEDvqoCyCr84gwDhCJZo42Fwp4f9kd4Fnz+rNpJZKTYs X-Received: by 10.28.109.5 with SMTP id i5mr8164134wmc.20.1512911810984; Sun, 10 Dec 2017 05:16:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911810; cv=none; d=google.com; s=arc-20160816; b=ZPUzj2w3uW8WoyDsyKOboBQlCD3rv2TMSl89i+oVWlao28HMic6Ptgg5mt5g+SnlrQ LyohFvzMapJCmQFcQb6u1BzHebSI0okf4YAKk2G7zH1CFSJwEkqFeCwcK67pC1TWqGo0 VrhoBTNeIbj/jv6PA7VBN3rsAGzZDCukHvFJDIonVdZybXAhStYy+l8U6ykS6MoMvjbm 1Kpbb2+Xoqelq9litvxuENdMPgVJuesGweLGEhdRIZAZSltKGGklzS13ZJU31WfX4rYt IsCtTUcIzmGhBXLbu7wiZFkIhiBqYb7sBNQ5eCnn1MBYqqUyY5Jwaa4BF6BKquyPdqcX 26RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=BzEmngbkEFLAllPuZ3KMB8/Ljd8YnNjEWFyEpOCV2vc=; b=oDK0ck0ThCd33s51VCNusrmJVNDVi0LPoTfF3xrqyD5OZGgq1j4Nk8frs7XMN3r3Ea tPbEX/pQNbt0hDPiIHfP9B9NbqL5Tiys5obIJafmdh2I8IbujKRrpRLX/Hilp9wfuoPV 7tCOznqS64kjyEgTIF54nccg0ZdRxf42fVseXxWV3HcKYWssCkeYL0vD+yhcwQi9UeBp zGAih+9dj9l945gkUjY/KQllUtaRGY0Cof0VCoFZ4fWQUn/9O2cdkWnY6HMxxOuTg9Cs iPJ5GGdfcF1ev5jt1YeK1DhXBXf657H/H4HSbfk+8n5mKbp3ptDEmhHXEO9FOV+z1Rz9 IJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qixvzu0c; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u49si9396449wrb.286.2017.12.10.05.16.50; Sun, 10 Dec 2017 05:16:50 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qixvzu0c; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA3D368A4B5; Sun, 10 Dec 2017 15:15:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CE5C68A61A for ; Sun, 10 Dec 2017 15:15:27 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id v105so14914483wrc.3 for ; Sun, 10 Dec 2017 05:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=odFeKuy19BSW2yh6xY5960jNvNUaZ8u1vNQy6VwZYWA=; b=qixvzu0cLuKp1PDZPo4CHBzzWjYsq0Vsw9HS1JZ3+rGxXEqn05zOdPN4eNL4Xs3JdK vIhD4pH1PDdPzTiU61Ic8E5P2Jeo9ve4Wnet12DymLmPN+WsaDqxubCeUmkP40TL5IdC I6WvVlBF80izDJuANQ5Scy5wSbaE2zH5bUG/xFE2gY9Sl4D8aQJyFiasfCLR8fNGXU6g ik1fFkBUaP8awjPV1ZMZtlNcWbOuNGgjqJpBBDf5wmuG52w8PaF4ZhOuYIdk7xvdBWa3 FOkBSZDfdv3ecQah4Vd7s2P1w8ZEF+EZv1SeDUMteIiGwtT93IA1tM7bcM9NIpba7M+6 x4Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=odFeKuy19BSW2yh6xY5960jNvNUaZ8u1vNQy6VwZYWA=; b=KmMGCFvj+HSFW1vj6vUUHS8z8Qsx+DemYH9LnGq52WhEyAKGyFOGvcyM1DSiVCMBHt 9cVYLHX5CCuE0z//pqYwrlOGRzl3JlEGCVre/BgE5h5YA096vEig+PpwWcnrSoC8ASc1 7gZNvokjLPtYjxSWZNaApSFEQ/dnGD30O/Y6Hu8JRdMQ7a1jbGAXar280cshQLpK5bWK xk44JqDcXgLjTz2qs0zD3lILe+jSO8MHYYRlg2M+WFuwd5IYVfOZOUvDvVZelrsT0FEl bbjlaZGJgZYzK5ZYXpqWvYlro83MXsqT9XJMyyCREXesgu+17VJWzIrAX7a7y5JbblFL icYw== X-Gm-Message-State: AJaThX47XNDHcph/7KA+ISJivIi8WISWU8peh6uUUp4OV+MUyaSg1r+9 XDI4wMfKOzFpy6rT1zEYtfDNqQ== X-Received: by 10.223.179.215 with SMTP id x23mr31708958wrd.198.1512911734076; Sun, 10 Dec 2017 05:15:34 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:33 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:18 +0100 Message-Id: <20171210131436.15791-11-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 11/29] avcodec/mjpegdec: remove YUVJ pixel format usage 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/mjpegdec.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 55676d8576..160bbfd34b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2415,12 +2415,9 @@ the_end: if (AV_RB32(s->upscale_h)) { int p; - av_assert0(avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || - avctx->pix_fmt == AV_PIX_FMT_YUV444P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || + av_assert0(avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUV440P || avctx->pix_fmt == AV_PIX_FMT_YUVA444P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P16|| avctx->pix_fmt == AV_PIX_FMT_YUVA420P || @@ -2476,14 +2473,10 @@ the_end: } if (AV_RB32(s->upscale_v)) { int p; - av_assert0(avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || - avctx->pix_fmt == AV_PIX_FMT_YUV444P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || + av_assert0(avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV440P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_YUVA420P || avctx->pix_fmt == AV_PIX_FMT_YUVA420P16||