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 70D274F7FC for ; Mon, 23 Jun 2025 13:41:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6F48B68E271; Mon, 23 Jun 2025 16:39:06 +0300 (EEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5D69068E21E for ; Mon, 23 Jun 2025 16:39:05 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-748feca4a61so2238837b3a.3 for ; Mon, 23 Jun 2025 06:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750685943; x=1751290743; 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=L0YlUOVYo4QOIQ+ee/16/UvLQ4bbew/YhthddNXRuv4=; b=P4Uob7uGuJQQ9BhAJ+wStGILioXzR2/zGrNIxuU6UHlJiO/Y3LshK5MPcxnqeib7qA RsWfgqUrxv8rv/uzqa21reJkFjmc+C4El0RNW6bE8qCINdAaue+TYlG2i8KB3l1ZC9aP cfH/VS0+sFNoxyke5haWJ5ZOhcaFr5fAInBR9iRZUjQGmM0qNgL1uGlIFQhgyYlY5ZV6 2etQYg4Bg09CSTAotVuVLsXQQPqJiufEcFXvnf5GA1rh2eYeQitDrLyhkW8ud5cIi//l afa8MZTjmIDCwBzbSC0ZbLEoGQQs7p3/G68jY2qAtWHV5oUH7el/du505KR6NcwXOd7Z I/gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750685943; x=1751290743; 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=L0YlUOVYo4QOIQ+ee/16/UvLQ4bbew/YhthddNXRuv4=; b=cEnvyE8u0pW20ow+A7yop3XEosQMcHci2bMmRIuFxr0XDO1N+CdRBvuxkJf8E14iux PCsU8Q9Ts4zuV9ef8OnGnycvQaaVXJBrf7IPyuNME72MoW95J4nEduX5vo7EpNZPg4a3 s1wuo7QB7mQCkOuAKrIBLqHJRY71IpdRuzo4wpJGqntvsiP7RCbF7eMjzgCammphUR5g dukLnERBicXO7+mV8NYnSFpOutiuQOQgVTWB6j2Sq+D+sSdhkrl+Wh5IWJ+0FWjQIrku 30SPNpT7bF/HShDFZsNmo7IsHA2ItXeD+OuvHoUICq1vOokf7jGMHYqOJobkpFq5h9En P9aA== X-Gm-Message-State: AOJu0YyuuOkaMYTG9DuDuqFHpvFSK24d/hn9RFn23OidXD3c6EW5mD+Q ru7wMbk3HqFclWMAfkr3dyaSnIlGJYYXB/Tjdu118B1E4p4Ud30LBB+o/Ocgnw== X-Gm-Gg: ASbGncsEWpbw/g89yfgLP035YWnUd/02N7jCTLkmOM1GzclJwZwuVzMqlQiSl2xZ8B+ /A9TE9XKYRSd4FYDsnonYIN6ZNGjNQQ6f3q2z2Gg9Q8q23O+cso+sIA2O8hXP5P4pcpsSCYrDQp qoN3IxUpMVXowiKKxthAK/Pw34wwW2qlxhJnU42gJjBgTIYfH/hr+Ha+m9SujXmNHUtq75RrRTM YdF1Cvz/6n1cuN2pFBDx6FNDi3IoUqHEo1yy795h7uhkLCJSHT5+gNPI0Wa612YlvOsmieXl40C a3YvjKun3tZkz8GECIhB2ZXHZHIR7kFk+EeUiB/w9Uz4JuZpKMlTS0/x7GO3L4HZ8BTCzR4zOvn +j/zLejbJ0ARlO7IHijh6Wvn6YO8= X-Google-Smtp-Source: AGHT+IGSgGSJrAgaUpo1ARpq4pneUpRGAFwGQOuJJyjf6xQ5v3GJEKxvCBle797DAaAcO3bwogV+dQ== X-Received: by 2002:aa7:8882:0:b0:740:aa31:fe66 with SMTP id d2e1a72fcca58-7490d5c1bf5mr19573749b3a.4.1750685943525; Mon, 23 Jun 2025 06:39:03 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7490a69bb99sm8262700b3a.155.2025.06.23.06.39.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2025 06:39:03 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <45dbfdcfeae89b73d481c858c18eb77cd8f3a607.1750685809.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 13:36:23 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 23/48] avcodec/mpeg4videodec: Avoid unnecessary indirections 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 basically reverts d4967c04e040b3b2f937cad88599af825147ec94. Said commit was based on the false premise that it would be an aliasing violation to upcast a pointer to structure to a pointer to a bigger structure containing the original structure as its first element, but this is just not true. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 34f383bbbd..c61fd23c48 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1647,12 +1647,10 @@ not_coded: */ static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64]) { - Mpeg4DecContext *ctx = s->avctx->priv_data; + Mpeg4DecContext *const ctx = (Mpeg4DecContext*)s; int cbp, mb_type, use_intra_dc_vlc; const int xy = s->mb_x + s->mb_y * s->mb_stride; - av_assert2(s == (void*)ctx); - mb_type = s->cur_pic.mb_type[xy]; cbp = s->cbp_table[xy]; @@ -1737,13 +1735,12 @@ static int mpeg4_decode_partitioned_mb(MpegEncContext *s, int16_t block[6][64]) static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) { - Mpeg4DecContext *ctx = s->avctx->priv_data; + Mpeg4DecContext *const ctx = (Mpeg4DecContext*)s; int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant; static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; const int xy = s->mb_x + s->mb_y * s->mb_stride; int next; - av_assert2(s == (void*)ctx); av_assert2(s->h263_pred); if (s->pict_type == AV_PICTURE_TYPE_P || @@ -2153,7 +2150,7 @@ static const uint8_t ac_state_tab[22][2] = static int mpeg4_decode_studio_block(MpegEncContext *s, int32_t block[64], int n) { - Mpeg4DecContext *ctx = s->avctx->priv_data; + Mpeg4DecContext *const ctx = (Mpeg4DecContext*)s; int cc, dct_dc_size, dct_diff, code, j, idx = 1, group = 0, run = 0, additional_code_len, sign, mismatch; -- 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".