From patchwork Sat Dec 9 15:38:09 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: 6648 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp813591jah; Sat, 9 Dec 2017 07:46:08 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ/Zr8/doiwG65ACIEbVWVUisk8HzhQDZyUys0v743FOwaDKbEUbQsYBChUI2EcHfxK3cP5 X-Received: by 10.223.148.69 with SMTP id 63mr31772354wrq.89.1512834367927; Sat, 09 Dec 2017 07:46:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834367; cv=none; d=google.com; s=arc-20160816; b=v22jGD1zrQFFJVAd1loJKkL872TYSHXBK5x++HfvdBNnVOIaJQk9e0hQWUqDmXOhZy EJSYXkvBOczRO2gEBOVtqCTiRx6Z3mdpPO6o7v6Ea1+vztycXeIN6/ISF6nNA5fNQsfV O9Q/3UTgxOICBnuXF3TE/oEQXHXIF0Q7QnJoZAFfB/qCHeF3200tZI+fjtCM59P85vKP xQypwGfIbHj64+IbdpSJubV3IcNppCBi9i83g1+aiaOPraEgknyyVemeL73BpTxn0Yne PMlbprPl8+H6xR0BT+QC1b480KbXvMIDnq7626JSWuAYIRrGHfR1MXWTzA5ctBYIVtlh oAFQ== 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=ppycod678UrL+UicxZwGTkebIlRWQJR4tmhLFzYmzpZwFSPENLbNasbItD0KSVD/wR zsf15fc7STrE4GnTIXaIgGmuYnYjo9fqhyT6UM2oT2JE29NiFi/HKk2DRO298bCijj/K 9I3Z3o5oyMfNOniZ1xLUebak9hOuzwGsXTCXoOabVc6GtXl50yIROXgIYAFUKuUp9x/8 B0qMhyQsxoV7Lah9xEU8rVJZuI4mQBGNjGDBOrPDSEWhFEBWEFqwb3p5xocie7Uvm9ES 5fA9sX4e0vNiSAJutlAd41zAe7qsI91jYk75vzH7tNQ2fzba+gd2dbH2sryR0OnU4uDT kHow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=h7nLIB/N; 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 q1si7921254wrd.403.2017.12.09.07.46.07; Sat, 09 Dec 2017 07:46:07 -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=h7nLIB/N; 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 AABC368A599; Sat, 9 Dec 2017 17:45:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C574168A599 for ; Sat, 9 Dec 2017 17:45:52 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id v105so13440203wrc.3 for ; Sat, 09 Dec 2017 07:45:59 -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=h7nLIB/NhtkW3+3ZNLbnIQQKQw/pvxJLBXKdPH08ATawbHGPr6U4hj3I3otUCSAmjn CkrVmalIfYGhyjo/TRZdh7mpUCo5Yr7IQwdQI5BSNaLT4WPz3prQGjsMisbJhKAq0sFY V6/G+SuGeYzvBt6AbgaiZVyHzBwF0tk84QKlIt/QDKTFjL15SjVdOOM3g7XYItcZMLEG HsfV4+bTEmZBdgwSMrisRRxVOX5fXn4UIPx8tUlt3/95RGSJAl+1wuVfHfD7qiqlVfOC KmM1R5xjNLr4JZ3lQf0nh6vrjOnmNx/GNMSxSYknitwPZ0OMFHhG2jvFMNjAM2X+EIPW gH8g== 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=KMCsU6cKI06nLjFgDx2l061XRKPSH68pQADovL1a8qyQEJUySssyIWr4dge+nAOidr snzud3BZ+ic1ulHgkkIWQvjHOkZQG0T81+JvTAR87BXc+vsu9pMC1hC2u60w0eo6fyC5 aaahLvhONKppSX6R32gi8X7hV63Glub/nr/ErJ6NZFSfZcDERcRWYWXLTQqpYwXaacSL pOBJDcH6FxbtRjUSZuCATGExMqCQDggPgUxEB1VBBxsO5a5HRVGwvwEBEs0DjV99jmAy o3bRl6RAnowLDWi1hcjdLatufj/CmldTYJuyPq09sCMY9GDOH8tXRFDS5hekoFwYVa56 lKwQ== X-Gm-Message-State: AJaThX70Isk0MaCh/CHlBgrsoDTKLs0R/AfhXDkWVi+yfnNiUijBhIlP Rz7iLhaTGuDbx2bs1YV3U7y0dw== X-Received: by 10.223.136.78 with SMTP id e14mr27201585wre.150.1512833957258; Sat, 09 Dec 2017 07:39:17 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:16 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:09 +0100 Message-Id: <20171209153819.19007-17-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 17/27] 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||