From patchwork Wed Dec 13 10:59:27 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: 6746 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5265506jah; Wed, 13 Dec 2017 03:02:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosoKB8jjJaNewAAkP3+PbhM80FMH5aHk0RcnoujsCBsi+Iq2Xd/AWf7+P4KIupv397SstOD X-Received: by 10.28.92.4 with SMTP id q4mr1508742wmb.42.1513162936129; Wed, 13 Dec 2017 03:02:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513162936; cv=none; d=google.com; s=arc-20160816; b=RyMYGsAFKuVUQyZr1thq+mmaAk6Ph9YP2O1N/IvXU+FkS9WurRxkXcYrn3kiTMdzv9 SZG0E2R21ah+BYK4Hx4EKbTuT5YX5LLSQIk72o87J1xUw1dUjlkzRv0emrJDTDzeXsbj 4dCmqoCzhcJqhsR9i/zrRr+qgbokAmw8eGr3PgvbN9TfxyD5IrPai5lQsw5140u9TXLL gVRekK9XunvJrGQUuNzDBcE9aN73pX3SvkL+gnCx6gLc9nT2IZUVgAwHIdhVFgReDuYo XPekZg6AriKR95RKUIUvq1Eyj77RyxC47FVzXfhfO6B7O0eaFnznJK4eknrftzeGctcQ 9EYQ== 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=ETERH9CcO9IaBPXdOGiwC101C3TIffDeHCyhdGsAGv/XTNi2kpTIf1vHwsPIWEZ0fS IO181WscN9Cz83ir5qQoaXSZpMWTCFU6Xy4UJF/q1/9QjfM7cnJPLHtBDSklp+GrNAgb CpYoc0RzaCNQzSHLK0/CnOpzvSpYKkF/7jOx7gCSbTm2DmhlO4lmLUwWSiGZDrA4PUrL EBNF0zx1pwimuxIQfQyzlmgWddmbAsy6mFbSRrmLvoLmcTHPY1NVFCN9BxKHq+bBziCI oyeJXf4gcqrEFzzMtPov2XdgtUrnDOLOVvca2KGXtLftf9YqJkcCvGG+lX1MWmElW924 RLCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VG4Nhfjm; 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 i11si1266572wmb.138.2017.12.13.03.02.15; Wed, 13 Dec 2017 03:02:16 -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=VG4Nhfjm; 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 819F768A433; Wed, 13 Dec 2017 13:00:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03BEB68A3F2 for ; Wed, 13 Dec 2017 13:00:29 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id i11so4194408wmf.4 for ; Wed, 13 Dec 2017 03:00:38 -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=VG4Nhfjm3bmVuqSy3vppo30w4SHMIplhlWWfsTDDzbCFoe8aKXx9kWY7Ec/Piv7CVp +lZht06h3o2LedeQgrb4RYPsnty3soVcjND05e4wnXWDt6ZM4yiSBkWMrTDluTRN3NbS nYuy0K2w7L+fvzUpAYRdj9RGJXFZBvc0VfV2jdwvS4PH0upvbNgFaZIGae8uzu+ueKPc 5wPKD37Bhd+YjMcCnkmGh17PxF+jDGzXE3TqL+30ksYLxk/rPgFSwfDoncUq44M02rvc TfQMP/DJn50U/KfWn4vHDmXwX95ETYG5w7OvLyFAu5KhvWwMYLB+bXVNhXpCAnANPLBy 3sUg== 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=m9iPR6vE5EOQHmFU0SiuqXGEH8NEiKT3lP87UzjFr6XTRE3rV/g+hL4nzvDcRyk878 IbevzgG4J/ONeBSp/HHbzYGfdnqnEc1oeoOSo1Xvho5LCTToBt5TSEdH3L1IftF3xLJa 3YhmjekJTBd92lwmTyiwF5k7zyblN2Dt6rGgJrYGw3pKKj1StUfMXLLgKFwHDXsZEx+G 3MYy/N/lCUHdGhWKfwyILTjc0z2enM5C/J8U/sBsi5VY6iUHUjKV5ruz6z2ik6zfNQxC gWAp03Wr2NXgrGjz1NNYKvWXFqrK8RMPLH67w2jiIx1oLqXkNYPRhcnUy8e3g5N7a4uT 0Rgw== X-Gm-Message-State: AKGB3mLZu0U+ABEltUqBTtr1TkMwWDhhU97JTqV1DAwgzuKTUrExOg3s L4jJWR5WJOCVQiJ1g9MzohRBOw== X-Received: by 10.28.141.11 with SMTP id p11mr1697963wmd.149.1513162837561; Wed, 13 Dec 2017 03:00:37 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:36 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:27 +0100 Message-Id: <20171213105940.32103-11-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171213105940.32103-1-onemda@gmail.com> References: <20171213105940.32103-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 11/24] 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||