From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 2C7FC4F806 for ; Mon, 23 Jun 2025 13:41:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7E04668E21A; Mon, 23 Jun 2025 16:38:54 +0300 (EEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B390D68E242 for ; Mon, 23 Jun 2025 16:38:48 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-234b440afa7so43113285ad.0 for ; Mon, 23 Jun 2025 06:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685927; x=1751290727; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=9qVFs71gmEnsLzxRJZLl3kdPZ+eZ921bx/XH0rgcW90=; b=Ci4pJEdDBj/fzVp1lLRjpSWallDKaFTQhrDJEl1L6F84J6yC/9/nONmd94JlKZPF1C VJb0wBRrJ8IbvcAHTD7O7Ij9I9GD+f+R+pz6aKShUnBM94p8Kg8BeJoZ4D2GtVWig7G9 mpWllzPmhgZ+zjEsvfBnNuwVAKNBLgpmTYpz3Ti+C+3A50WbYm7dUDZ6XxZJib+jcGbW AX2IEgsc5OJvOtJoiPcw5WNZeuMsr9n2SGgBw4D45l0X2vkdgFKDdBCc0U6c4MQG6cv2 NsIIafAoOzbozHD4jay7Siwh4zAeFdcvrlu9QH0c12aD/hADOojPt8hd28mszb8AdIiR BTTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685927; x=1751290727; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9qVFs71gmEnsLzxRJZLl3kdPZ+eZ921bx/XH0rgcW90=; b=OvW6F+3e8w2xEm3uqAYdBkbLfEHosPr4b0IAQDKE3uD8uchrD5vM9Os1pXZj1EHhkp tAQ2kCcfFCMXThweUN6AWXOxPR3pPVGnzxksQf1lsLDAjz85au0Wc94m5skEzW3R3OGr FXFLGMKAxHdW01W1zqKqITyq1ID2CCQxzj03kiN6VxMzXr4eQ7HbI9Mqhzvv+PdzQYi9 er56AvXOsUhBLDbvQOnwryMNLfWiQMH6Gbpyq39E5n2/BGTCwAR0Bs6Y1tD9u5MwQP5u bew1cHpSxBDsRP2uIgx7X4AeLv1oxhYNKfj3ABdtI4+CQnSo8tK6xdTkDtHTo9t+BEtg 1VEg== X-Gm-Message-State: AOJu0Yxme3CwmUj7lYYn4aoYse3tvS3mFcEm+8BK71vRhTIISYHwj3DJ zbYu45Z7KO9JnQF8V9bNLEAjBJ891nV6WwwCE2edXol0kTUDRrziytgzhiXMmw== X-Gm-Gg: ASbGnct0TkpsweGKBXcz8Zh3fdglT5p/GibVzt5rDvefzdtP2AUbGVqIVK4SNbOtOU+ KB5e9QKflOq0OjyUUtSD3xvZRWA44sNdtVDCzgyaEWYlnU95f+WUr0pSTgASf3TCojbU2lOCfkX Sb5KCm5RSkFb4VxyO7q75KzWxhKjHG+RtOFjp8x4k24u//6HHpiwVfknN4IzPvrJnPDJqPZckA/ oSMNdW/kVr4f+NBVQMy1YolMpv7OFPoWjABF3/IBMVkoSVHZuqmq9LmIp7bEXdcLIno6YM5DZFl hdGeaiBUe2gUk6/uJMATbvro9NII9LPSA84v7Vn5nSk7UOMOtUOkrenLWNcu1H/U54+7dwBWbLL iFuKcBsQ7Gqboi4mm X-Google-Smtp-Source: AGHT+IGoMuMlMVvbz25pDHQTIjvTtDS8nmnOZ8+A6/IWOr5CamEQJtNLXu0b1aPzToNDI1Dch0t2IQ== X-Received: by 2002:a17:902:c404:b0:234:d292:be7a with SMTP id d9443c01a7336-237d96b5493mr201819245ad.1.1750685927007; Mon, 23 Jun 2025 06:38:47 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d83937b1sm85897665ad.52.2025.06.23.06.38.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:38:46 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <12da8e64829f267e731768ec0c1064a42f817781.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:20 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 20/48] avcodec/mpeg12dec: Deduplicate variables 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: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Andreas Rheinhardt This situation was created in merge commit 71d008ebe4f96974433eecfd3575bc82eb4b06a8. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index a056dd87cc..cba57369cd 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2095,7 +2095,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, static void mpeg_decode_user_data(AVCodecContext *avctx, const uint8_t *p, int buf_size) { - Mpeg1Context *s = avctx->priv_data; const uint8_t *buf_end = p + buf_size; Mpeg1Context *s1 = avctx->priv_data; @@ -2111,7 +2110,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, int i; for(i=0; i<20; i++) if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ - s->tmpgexs= 1; + s1->tmpgexs = 1; } } /* we parse the DTG active format information */ -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".