From patchwork Sun May 2 13:59:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:cc:0:0:0:0 with SMTP id m12csp1256174pxt; Sun, 2 May 2021 07:07:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4IVJdYxEwS2OXpgKGgaxWcOpIn1ae1+2fhaZwKTP1s4V+N3U9NZwuU+ZcjW/913deo6qG X-Received: by 2002:a05:6402:cb0:: with SMTP id cn16mr6126283edb.15.1619964435913; Sun, 02 May 2021 07:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619964435; cv=none; d=google.com; s=arc-20160816; b=rH5BHPT3HIQjCVbzDS2yWvN84zJ/h9E/mgcVL4usG9uy3Irf3ti1CnjETdG3UKIIx3 evSj2W0V7E3LjJbTC28Xx2fCNJLf73Rqw/YCZJViXOMIuFEhhTD05GqxRkSvBkFYFJ/2 fWx6IuOLiOU9+CJQca8V0T8Rnvik8akty20w8nKQHDISM9EGeBAFNpvvanX6+RTJY6A9 hTY8DAlj3JzIF+fe919IQBU2jVEzWYnh7iKKhh3mKw706bAi41iBLMMb46OKzyRG2041 uQygn7EjNVNFJE61q7n7yXnVnlEsvfqXlgBHx+d6w8YwmHegi0itm9II4q9CvdOIkzvD Bwkw== 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:message-id:date:to:from:delivered-to; bh=BgX43dFk1pepDT7aOOt/wgxGmE6GYo3I0m+KPFkDQSs=; b=hVkN8MKld1DjSlNZX5C4r5kIg7L4vKDH7mjDYDJER3kJmgNCJxHGretnzXg7TLI1rR e5k+t+4yWtXILn2o+5ICVQ1t/L1LojwCe76hBw/zVhSpHFfFO2YaakoiCN3qDZY7/WAn VgHR6eyk62tI2pn+7fm3LR3Pw1cW+aQ+OERNDnsRUdzcHFfkFUiNfFGLrqF5aqIr7Xov FQX2tBtHpW/5Sy9z/5zTq5GzU8wLp/DpW3ZR32IGUz+fje602xpN+NAK/K5PA/2nIMhk lcR0xbVOJx6X18Xio5/M+XkSyx3MF7lufVfQAXKWQWBvXXmmVZgkyE39bo3wgqFWj5rK buYg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h14si8279046ejj.626.2021.05.02.07.07.15; Sun, 02 May 2021 07:07:15 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A293D68834D; Sun, 2 May 2021 17:07:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E82D68834D for ; Sun, 2 May 2021 17:07:07 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ldCdj-004Uc8-0J for ffmpeg-devel@ffmpeg.org; Sun, 02 May 2021 16:00:07 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id dCckleYa8ljeHdCcklCfd0; Sun, 02 May 2021 15:59:07 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NcpgZ5gT5NfQhL8WVjoA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 2 May 2021 15:59:03 +0200 Message-Id: <20210502135906.12288-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLEjznkJP89Ee2LVuKwi4XEdFTiwqTlBGhX6YORoOps1LBepz5uJscnGt9UNO0YwKL/zLALQzMHv2Zvma24K7zsLPkz6wQyLfzjrGhSA/EAYVBlqhV74 AgGOfP7oy4nNwLmljczZ0K0+mUwyhRDrXL49wWmMwEzcXPiuXYuU82Sa Subject: [FFmpeg-devel] [PATCH 1/4] Revert "avcodec/mjpegdec: fix SOF check in EOI" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 6YFkZdqUYux+ This reverts commit fb5e2d71127ccae19c3f80ec363bb67d1871cb74. --- libavcodec/mjpegdec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c829172200..16aed078f6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2560,16 +2560,11 @@ eoi_parser: s->progressive && s->cur_scan && s->got_picture) mjpeg_idct_scan_progressive_ac(s); s->cur_scan = 0; - if (!s->seen_sof) { + if (!s->got_picture) { av_log(avctx, AV_LOG_WARNING, "Found EOI before any SOF, ignoring\n"); break; } - if (!s->got_picture && avctx->skip_frame != AVDISCARD_ALL) { - av_log(avctx, AV_LOG_WARNING, - "Found EOI before any SOS, ignoring\n"); - break; - } if (s->interlaced) { s->bottom_field ^= 1; /* if not bottom field, do not output image yet */