From patchwork Tue Dec 12 13:56:08 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: 6706 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4103981jah; Tue, 12 Dec 2017 05:57:25 -0800 (PST) X-Google-Smtp-Source: ACJfBosi6RJvKPvdrITtKXmBVIsGj2+4AnnVfMUJLtWEmLcbCxGFxpjv9AGiB/IdzvIEvdV+0VR2 X-Received: by 10.223.132.129 with SMTP id 1mr3870489wrg.136.1513087044943; Tue, 12 Dec 2017 05:57:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087044; cv=none; d=google.com; s=arc-20160816; b=FYMK5L2Tk1nOudb2B7qfF31cQikdnzEA+1EJYWcHe/mL1HF+09BAa2y7IhF3SM5OZq DHUOoRlYqkQCBJyi7Ex7lG51pkaNoFf5Pr7Tdk0supXErTzW3zmW3bLqmsqePzy2wW88 6AvEYwkxCcsLNaWXzqtkC44cmzFsXUR7X2bJXDX2tuCURrQt4C0nWrRyXBK6+5btbp5+ PBFK8B3YO+Ag0/x2Q3YRFYoT2wWHTJbJSTS1ovPmFROBvrimUsJhGtLRUXr0Ckha1ySj sWAtAv+Mg9hD7mgZBqljifVDuSuxx8DB6JPw5DyYErFPJRCQpSVoXmrrKR2z/gue1xPL K5eQ== 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=GGXxZK9xBHdB6h/planG1GL78yjNd8e3Z3bGhdIy4aEHnaM56oifSfWnw65Naau/Tj CH9MgLkQCMCgkiXPDZEYPV5AUk7+D03Ci/ng9auDfd3NUG41uM7+RT7fOFrGeaYTqrf7 2tFuSWcsYYmW76fbKjdTuMobwBHCiyRwTubdQkHgOg+rnq47NKJhiJCiKlg7s7hr84mf nGq1ocicv3kTHP4ySgtljkRUPvGzA0dNo3qTCtgA1NykuieI0J3Mioyr1v5LIKuyKHzk elvU+0PS8vNVhxfVl16o4MOqRGyVxtdRXC9yNnTm+F1GkT7GnGzQmJXcaxVGHVZqxqWx /T4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t4bURDaV; 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 y43si12292905wrd.466.2017.12.12.05.57.24; Tue, 12 Dec 2017 05:57:24 -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=t4bURDaV; 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 7DF0D68A629; Tue, 12 Dec 2017 15:57:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E59268A399 for ; Tue, 12 Dec 2017 15:57:09 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id v22so21253305wrb.0 for ; Tue, 12 Dec 2017 05:57:18 -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=t4bURDaV3ZiCVlqZG5Vo6aRtwD4TEaXidHzeKN1ZlJ24KSA3W4oZYAB0Uh0Sn+jugu e8VV5WjnuGWavB4xH4n/R78eUO8FlxIOm0J41+sp2cbC04TNmbHYhVU+k0UkxGp0W7es j000G8BMh6SQMEExtVtRvC1PBlH0B62hpT4rn9PfxzZulEnE6XHy+Qv2nqTQDUVjUvB2 1rxU6WOZ3ZqUMf5j+zjTXhVDRy9ULUDJPe+xf6pC2ol4GG98JLohAjchdDQaCNDq4v7L +2sK6fSwV8qZEB8KyPGg6dA2wFfuJPXbs3rFAxJw2ZMbpyyXBjMGeZcZwbgmjbvGNX0Q Vzjw== 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=an6vAwtCzy0enOh1OoSL4NzvWZ2PpUUzYrEiX8K5ty9yeFGMCBhbL3sxDY7CqeC6ch ZLXIEbjdnVmF83F9QtpV4dzxvsM0gCkTR8Tc1lJ/t1DNT7CrbjZzW2amUc6mElfzi7v+ 82jRwzQdd+OyrXpPw9U5D9OBokJQ0JEbX/qL0HzhTlKHdNLZ5d5gjnOS9CckYRDfjgBP FlwsqvCI/rYfr6W9yDpu3TLhNh5C8VmYlSyMcs+QdtcnzKfOWkXTeIriacccpUqzZ7jf BTK12Zl190ZINXhMA83lYhcYwntmUSzTEjAEQXuvq4E4YGlur3v4QsxwRwsnG+joDieM 7kHw== X-Gm-Message-State: AKGB3mLcoCqHopWkuEAkJtDcy/m1rx84c7Qb+nsLSKn87TEHJZlAh7QJ pAZ1wxjzSpJhlhRFhVbhFnJckA== X-Received: by 10.223.196.194 with SMTP id o2mr3827396wrf.246.1513087037416; Tue, 12 Dec 2017 05:57:17 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:16 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:08 +0100 Message-Id: <20171212135621.30835-10-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 10/23] 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||