From patchwork Wed Sep 18 03:25:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15126 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DEFE6449FBC for ; Wed, 18 Sep 2019 06:32:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2E616881FF; Wed, 18 Sep 2019 06:32:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A93B687FD3 for ; Wed, 18 Sep 2019 06:32:30 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id x2so715732wmj.2 for ; Tue, 17 Sep 2019 20:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6wztLDQkPU8s1a+eneIREEPWhaoRsBEf9jFrxiKNRCw=; b=QFdvyg0iArzrCQziv9Hp6kuGKTS9nyLEztKru1m5XhCl0KxmQIfY59vJy73hXTXDyF lDBU98CtzBLs6BZyiamzOc+9/GODtastEzBAYlecaZqJnrJhUW6KsrAeM8diJOyLUk7i N0igkMkc9la5YYeiXl0HRUTaK5vuSTH5oS3cvX4xCb1x1xrUDimC+xjNWyTFL8WvX+T2 hXNCLIsIS5eetsJdVywfVoA+KaIStXy/maoZ0mg97DT0bZa9bh35qvBeU/RmvJ+EfQ0j K+yqxoar4Wz8r+eyaeqjB5MshdHy7W4fYwGC1E58D9ilsD7NK/8syyXAHhMMS+9rvWDD nlKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6wztLDQkPU8s1a+eneIREEPWhaoRsBEf9jFrxiKNRCw=; b=M2O0lWzoMaDDHhBGmUvT7fF9461aVxuof1e9FNbJla2G5QCRz6b7NQfutjbyxAfm8R 2RCwPVTF3wCbic9thuUEWO9bHOFpI2uHMnK6xPrTdluNvas/JXICozZ/0zOhkQ08Fv6V rEUdNAxHg/eI6biFb1prX6BZjHuPi/9XgPqjF5JAY38Bt0twLzrZ4EzX/vIghbwulWQU 13mo36EBL2KxaWOX4GgKE5fdcQ13FUhQ30tnIJk7ZWKKo9wDL0h6XskTQ8VFm/i3rjh9 qVPf7mQn5yuGGbWIrnptpAcppCDGAsk4rNARaIPqgxOTx2zCI21VqoW0E5Wfnatxj5QG EiyA== X-Gm-Message-State: APjAAAUPgkU2Awvj8zGITnhDlLlaZXHZESqyv+WCFE7SfQxdsNmEle2t zF/LHwxYla2KhbtlodPGFzC6JuAkmAk= X-Google-Smtp-Source: APXvYqxCfA7l0mresfn/MwC/SLEsSDYMWX+6vqJEbLqLZ5uqfVRVmBpz2nLmYfIaWTM9qWqP2NPgoQ== X-Received: by 2002:a1c:9d0b:: with SMTP id g11mr821741wme.22.1568777549907; Tue, 17 Sep 2019 20:32:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id 189sm806891wmz.19.2019.09.17.20.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 20:32:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 05:25:59 +0200 Message-Id: <20190918032607.11774-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> References: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/mjpegdec: Unify switch statements 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This has been forgotten in d5a3a20d. Found via PVS-Studio (see ticket #8156). Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f095afaed8..8b053613fc 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -555,11 +555,6 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x22122100: case 0x21211100: case 0x22211200: - if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; - else - goto unk_pixfmt; - s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; - break; case 0x22221100: case 0x22112200: case 0x11222200: