From patchwork Tue Jul 2 06:03:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 50277 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2220092vqv; Mon, 1 Jul 2024 23:03:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUi1vC+rFiRckVA7DOHi4t2rZSzkdHG/DdUPoSS2sxkwFrR9tkAmCihkDb2OEykWg2rIsEYMGpR7Ov/x4C+AGvrVjQwBVSeSz1P9g== X-Google-Smtp-Source: AGHT+IHGPdvDEGH84rFFsk5WPaHdlC6fM7fndAcV5SKf1VFzxEB9z4JG7eWDcH1V1pnGUywr3DK8 X-Received: by 2002:a05:651c:1053:b0:2ec:4399:9be1 with SMTP id 38308e7fff4ca-2ee5e2a8b15mr43408321fa.0.1719900223110; Mon, 01 Jul 2024 23:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719900223; cv=none; d=google.com; s=arc-20160816; b=iy5kQAELAUY2BfYTKWxaIhwfDIPKXbDivCV8+75SioaAd4k3Ud5r+xx72+cXOvijX/ a1SwmkQezQ8eERgBIZq1TZ99gJr7bEkpuQLyrTG4iQGxEwUMv8UMkPUhV8M5bdY33Z+E 8SIrDw1zml5x1zEV212rCPt6zhXBUXT1/w6GtbMqb9qMcEXiQ81SaDuii+Wsg/FLyewx j7l/VgnJO0YbXLF39Fpk9TdFKQo6QHIEqqhRN0FYmYpxM2vTliyka2kkxQiyiYSa2KTP 85XT3N94P8zU3RUZGWYelzQ7gHdD+Krc+MrTEgWNDSJL+NIxp9bi74PZ1j8N4PrRkKgu mHmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=19udaIb/aAEF+1ZuhKkqKM4CjNgC7/qzhYs3b7soaKw=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=Q1CjbXD0p2idG2kgBB7ejMyVmnAiNGXZFLS83m1flXxwR+2r2bzybwUK5S4JEMGizq ZxV1plpddDN5ZUkO8fD5pfWTi1Shzz2xAKCYudhNScLxKejIR/E5hCmjxPmXEiQwsomR iNc9Euekb2pcWAZa/S7zlu1zkjzeb3colGZ47ErEI7iGoWEq8MpYiz6osS+0r21lWUeD xVOcjgHkL3Ktk1QBeOGduQECoC27q+BV3lYy16ME32XUTIkPc9Fjc878RHDvFLErK06Q 0Iu2VL5qEHNUqFDnA3sHMNK5VhHL0aPMwcmb3aJ7D26s/Z24AV+MO4QHxP4hnopze0EY V6Rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b="ahiydH/G"; 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 4fb4d7f45d1cf-58613816089si4356258a12.51.2024.07.01.23.03.42; Mon, 01 Jul 2024 23:03:43 -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; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b="ahiydH/G"; 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 BD9AF68D8BE; Tue, 2 Jul 2024 09:03:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f98.google.com (mail-io1-f98.google.com [209.85.166.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EEE468D6D2 for ; Tue, 2 Jul 2024 09:03:33 +0300 (EEST) Received: by mail-io1-f98.google.com with SMTP id ca18e2360f4ac-7f3d59ff826so137798239f.3 for ; Mon, 01 Jul 2024 23:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1719900212; x=1720505012; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8BEYrMqIdJDvq8XUjyuhFB+/SFq32Fv4/gENrBlNw2U=; b=ahiydH/GZJ0CHcRV+j5zZ1lFYMdftWu0hv9bxKHKV8lqBl3mticp+zqeB45H6VB4j1 at8WAbK4MJSBxxdCqHCHo1FfFiRfhLl+2WOnmyFbyg32Aw/GIPDJigWTxni8ScSqjk0o 3T+WrxpAS7cx9vKamgRsdBZT4pYq8Szr+BBZGm6vcAcRZcr4sOIuVvE2oXVRJBiW+17r qwQftxitNZp0zArfFMWnXbd4dC11dPooHL34shL4Mnoiws4o4YEZiwo7u5GKa2BoN0Bk fAJKBhfGqAys199czRWXYJj3EXUD8e6fHmO8sQKAQrpN8It6uIRCUOM68xUXHuVBLy82 P3yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719900212; x=1720505012; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8BEYrMqIdJDvq8XUjyuhFB+/SFq32Fv4/gENrBlNw2U=; b=dCo+/WanisQXwDOcyrjwdiycMvbKqu/wv5s8WT2FpCFEESloHh38NlwS1c45/ttxPk SK/d794SAUlcBmg8TKNoV7qqLnkLZ4DhCcbkDoXrM4RoYVoNvxwjQ/1jvXAXqQuwMlVo FKEYazsVLNSyQoz1PtQxTXnGn5hNl3zyayMXYsdXo7PRhHksF8B6XugAN99GOd9alZD5 LVhUCRJuM8eeILHtcOdEOkRulOnTnWEjJzmeSWGuebdC8gyDh6BCA2XRixPCJelUjjn5 7l0M1lM5LFAbEGJsc6+QcUfQ0hQUdcP9sP8phsgJ/M5TYe+4bxMnIL9XSk8h9MWF/goH ufXQ== X-Gm-Message-State: AOJu0Yz6OoaezlXvuYMAavjVF/yM1dEoJQGAHTkcFxTqXvfVvLLpgUCd f3UZFPp8MMXXy28fayA78bTcbhbHQmApsa+9mJ1io02sdm1y2lq2gC0AiHR2qD34kRDzohbpQME /yC/LsD9kOeub1vIK7M89KIwyz2ao6VzQDZIeI/rw X-Received: by 2002:a6b:d807:0:b0:7f6:1ed4:daab with SMTP id ca18e2360f4ac-7f62eea16ccmr674595139f.16.1719900211857; Mon, 01 Jul 2024 23:03:31 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-136-218-80.hsd1.il.comcast.net. [76.136.218.80]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4bb73e27e98sm197044173.40.2024.07.01.23.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 23:03:31 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 01:03:29 -0500 Message-Id: <20240702060329.1309157-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dvdvideodec: Remove redundant ret initializations 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 Cc: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1atTvA/yK+ui Remove initializing ret = 0, in areas where ret is only used to hold an error value, immediately returned, and the function would otherwise return a literal 0. Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index f5b7dd33e5..a825e4c0bd 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -1056,7 +1056,7 @@ static int dvdvideo_video_stream_setup(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; - int ret = 0; + int ret; DVDVideoVTSVideoStreamEntry entry = {0}; video_attr_t video_attr; @@ -1217,7 +1217,7 @@ static int dvdvideo_audio_stream_add_all(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; - int ret = 0; + int ret; int nb_streams; if (c->opt_menu) @@ -1324,7 +1324,7 @@ static int dvdvideo_subp_stream_add_internal(AVFormatContext *s, uint32_t offset subp_attr_t subp_attr, enum DVDVideoSubpictureViewport viewport) { - int ret = 0; + int ret; DVDVideoPGCSubtitleStreamEntry entry = {0}; entry.viewport = viewport; @@ -1361,7 +1361,7 @@ static int dvdvideo_subp_stream_add_all(AVFormatContext *s) for (int i = 0; i < nb_streams; i++) { - int ret = 0; + int ret; uint32_t subp_control; subp_attr_t subp_attr; video_attr_t video_attr; @@ -1469,7 +1469,7 @@ static int dvdvideo_subdemux_open(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; extern const FFInputFormat ff_mpegps_demuxer; - int ret = 0; + int ret; if (!(c->mpeg_buf = av_mallocz(DVDVIDEO_BLOCK_SIZE))) return AVERROR(ENOMEM); @@ -1504,7 +1504,7 @@ static int dvdvideo_read_header(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; - int ret = 0; + int ret; if (c->opt_menu) { if (c->opt_region ||