From patchwork Sat Dec 16 10:12:32 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: 6814 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp470905jah; Sat, 16 Dec 2017 02:18:59 -0800 (PST) X-Google-Smtp-Source: ACJfBov39ftAoaOJkkayFM5cT7g8vt/4V1PaAXBCa6FU5Ehh+WGfUEnCpM4pO7Wo/u8sCxHhu00n X-Received: by 10.223.157.137 with SMTP id p9mr12291148wre.92.1513419539615; Sat, 16 Dec 2017 02:18:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419539; cv=none; d=google.com; s=arc-20160816; b=WkaKfMLcaGi/GsxgrYruCZfXr0u7se15+SpMKqs0x6RJg46JtpWD14QRZCzLs30Fh0 jlpSXEcBO4V7BBCIdTsOslqWN1luQrp5Nxr5kxnxKlRpTTuyp/uNdrIR8aP/bZRP6qil KR0tm41M/6pjC/8CJBVJmBsWpKXz3+IrHug0kP5SDgGfCPZ5cS871YUwheGSZQNMR9JF w9dzgISuaywxlXZ2ODDdqHS0I01xkclN7b+XiJ/NKY4+d32D89BiecHT4WE8lnn5X88U 2HsFBlVaQrR1CUB/JmRVfP6Tq1KigiruhziP1qKE5kU1bv5o7LcaoUNLe/nOfvz+uTi3 lu7w== 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=MXvF3lIWC2GmKa5p63yK7y4kcuvkZOZ2Dk5AwHi5u/25SLEw2z0G7URj/gXmEFPyA2 LJuigqlIf/Q1okhW8R1QqIgUq88/T8hdl/NFBhAFT0JqLTmQGGIza88gob8f+Q2vOebf W7kYenYvEtSFzryVrDDbldYv1mdGYfYrVIhlDjJ3R26948QIr7g6/Cbu56MHpjxpmNpI y29ywIYdNaEs0mT4RxyV+aNgZFhpVCCw1CGMQi1jfG34nr10vabZZTpfJ0oI0FMipM/F ZutiVmgUpBbc9eMADNCoS7o6XcsWkaDxzS7vC7sw6ZbMhA/HsPMEKgYNkA18zgEzhs0z Ut5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RFW6k+ov; 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 r75si5967492wmf.156.2017.12.16.02.18.59; Sat, 16 Dec 2017 02:18:59 -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=RFW6k+ov; 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 63DF6689B0D; Sat, 16 Dec 2017 12:18:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B50F6899E9 for ; Sat, 16 Dec 2017 12:18:39 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id y82so1158745wmg.1 for ; Sat, 16 Dec 2017 02:18:48 -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=RFW6k+ovyn3GwT5/ocK5TNcqhIVBtPRqzd+8EOz/opbjMTIlNvrJ7RnGBWXDG9cDxM xZNKFalHYHn8SX++wVubcw+TK+xCxfyU9Q6EtO2whceooajCogGxRLhZN+um1Zfqf3DV N07dJpfKi6RRBTEUfv8Dn5e9MBYYdCuyPXSnqA9ckx2iDjfKzsAb4eEBN176fa/LUp7J J4wJ5GmMFY5s2Rspc+Tn2lRCyqlr/jMz3MuSRlXnwTJ7vavn65Hklu4zlsI7GobGGP7A d6rFvrJEq89+KqzHl7F6jnP161v2ZjXytTx0GSzcBkyWZGOdN5cAzmDYBc5dhId7E6QL waCg== 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=U8qi5vo0VgP5UD+G0eo0rnSPtj9WGJ32Z6RtNsPUFfk8KvLp2vg0R1Yt3ah/e7Ace2 6m1FCVA60f4+tVgSAtEmWz9KoO/+bDVnYdOTW4d+Cd0lfwwKy4UIom4NUO1i9PTjCc6b NM9RoMbBxg00JCq1Z7o7ZbQ73gkLpEuQnw10os8GbBl9AlqLXjBQI5lKOu4lff+FroNa oTc43J0/paBuyoKTO6kz/lRdEYF/fI86NnAhdIa57RGZuezdens0GckP72ZicgIRcBAL d8xnsT8dQdI9U98VWIbsvwV7L5JZIPAD8I0kl7FZQPdKM6MUiAJnU/QbfR5MjKvhjYlV /mjA== X-Gm-Message-State: AKGB3mLDKInnr/ZInc75iIekoKABR6beZS1RLNb+OZzC9Fc1u8+Iv+R6 Ht7V97kxF/+ttzZs/FAfOvPpcg== X-Received: by 10.80.160.198 with SMTP id 64mr21247087edo.242.1513419223089; Sat, 16 Dec 2017 02:13:43 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:42 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:32 +0100 Message-Id: <20171216101245.26977-12-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 12/25] 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||