From patchwork Fri Oct 25 01:52:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Zemtsov X-Patchwork-Id: 52483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:be6b:0:b0:48e:c0f8:d0de with SMTP id bd11csp37912vqb; Thu, 24 Oct 2024 18:53:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7f7NQUiva/sJTcK5ClLtNYqmxYBSH0CGn24X2NbjAf0+rt33T3Gs4ozVWKH4PIneClWaZB1zNSTFxgbZEKrmi@gmail.com X-Google-Smtp-Source: AGHT+IEaKKG9O5rmxJvHLfHTDd+dBcpE/IoQhdATHlZCvV2qCOA3SBbhElEw0xCpiSPM1ecTHuq/ X-Received: by 2002:a2e:a98e:0:b0:2fb:5138:a615 with SMTP id 38308e7fff4ca-2fc9d1dbf4bmr47658451fa.0.1729821182578; Thu, 24 Oct 2024 18:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729821182; cv=none; d=google.com; s=arc-20240605; b=PUkph/hwZdFvYfLxh/Z83hvG/AHA6ASO+xn8SvYirYtwJ93vBjhvatzLGDM7ySElu0 Kr98iiPOkC4fSp7hAiXfgDQoAwy8XcTvhUHxMe7NeAFq0xYvVWU5ts/24xB+VmEhGvmj XTbNNOtAjCAjRnLUQGTQfVGXEFWrAOLYIG6UpswEYFIoqWI5GSsjNbpRXUgAa2Suc6ii lC2l+BwyoazarDlyluLn+nnd9vf+al0A7c79cZmbMuQqa4kiMCIim//HX16lRyoOJhjP PqubPQHM35f2uctwXOVV/+HQIQeV+eB+zoXAQiGOIDf4J23kt2MmDBPDm78AG/s5GKpG FiHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:mime-version:date :delivered-to; bh=2stSnUcvLSBKhvcpuSjWAKtJoZHvEhfvFSeVGRXHV6s=; fh=3IDY6TKXxKBPhgi9nKd+iEDvjc24lxC/4GxNQ7VRhls=; b=bzSWSBE47qYldurxwXA5xCEZWmeM7RStntE+7qzbEKUvzBo6xw7TQbR/MqwpQlIuZO kft/+38fdbvvdmHf+NV91zP4Ph+/xEpy2EIdPRkBWmOg4ABT+a2s25VIz5wgYwmSa4wR ImQUc72AOOQY3FzT4bm1nlzAwzwLieZ1sbf4F7VhY5q2SYDVp0RAfmM11ohZI7rioW8J kF3sGn4kyCeNlKPH7TEHcwDpUu7UNOl17CoK1gpMiVe0hX8Qdh7fdVNBAZ/JSOu3jZ1a ZmjX9HUXKJJhirJ3ZxyYia5D1p4NjHoWHa2C/uLoQMgDNOmVb9U1TH0vVBX6DRJjSI1G Ru2Q==; dara=google.com 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 38308e7fff4ca-2fcb452195dsi368001fa.186.2024.10.24.18.53.02; Thu, 24 Oct 2024 18:53:02 -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 D08BE68DC7F; Fri, 25 Oct 2024 04:52:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C27DF68DA4D for ; Fri, 25 Oct 2024 04:52:50 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e2bd9b1441aso2464309276.0 for ; Thu, 24 Oct 2024 18:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729821169; x=1730425969; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=x2BPaEpa4mSn3/zZtYxLfml5tSsfo/TV7ev3oHBlVUs=; b=WBXN3KvrWntcAQlajobXpPqaCJ4whoeuAPe9ZHMxGd6wzjmlWgz12XR186ObwfqILq HG5m6ZUz5fNPekZxQS4RqYy9KZeGQJQJpOq82On8xGhfmqqyzUoEeMdbRT5KQQPMvYIz b5WX6vyy4y1PstSbw2I0lX3ERV+lPZ6+Nl4hCv/cH90ENhZNyZVBUXXkTLU8shlmG0Ox hxQPEXtFEQVmBqOUqDNLXQE/6wmeIGJrhXRdcWohik1M6CvCK1zbyDI+HGDxeiVQXOzK ltWQI/enWl+lPDREd+UOdgBIrHsSiSekDjbFNW0r3/o7wNkJXN5LJqwCN3TPFRHRGdEk YJyA== X-Gm-Message-State: AOJu0Yzkihp4GCclFOxrDZKvqPBy7fw7+5ugYl2H7MPg4JxfJXKGu9HQ CYUmfYCOOVczH+Wk/S7gzCVlpHMVLw5tq1Lg3qO8fX5qjMNo30RpyAN+psHjjPSot/Thy9zvsaj vPiaen5sHW6wX5ctDdq2ppmng4PnVn+8HvGl52I/BrFUYxxM4VSjwOPdjJVmYO+NsNP3e1DPfZ+ JvzJb0vgFKR9UquQPacpDpDi2Bzw0BlXS11FpEEDBZk8g= X-Received: from ez-linux.bve.corp.google.com ([2620:15c:7d:6:9395:c059:9e68:f254]) (user=ezemtsov job=sendgmr) by 2002:a25:2d0d:0:b0:e2e:3328:7a00 with SMTP id 3f1490d57ef6-e2f23028558mr17232276.3.1729821168820; Thu, 24 Oct 2024 18:52:48 -0700 (PDT) Date: Thu, 24 Oct 2024 18:52:45 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Message-ID: <20241025015245.35832-1-ezemtsov@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Fix incorrect enum type used for a local variable 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: , X-Patchwork-Original-From: Eugene Zemtsov via ffmpeg-devel From: Eugene Zemtsov Reply-To: FFmpeg development discussions and patches Cc: ezemtsov@google.com, "Ted \(Chromium\) Meyer" , Eugene Zemtsov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L+h0vrnbR6xS From: Eugene Zemtsov It's AVPacketSideDataType, not AVFrameSideDataType. Bug: https://issues.chromium.org/issues/374797732 Change-Id: If75702c6d639ca63827cc3370477de00544d3c0f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/5950926 Reviewed-by: Ted (Chromium) Meyer --- libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index c331bb8596..fbb6be2971 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1466,7 +1466,7 @@ static int side_data_map(AVFrame *dst, { for (int i = 0; map[i].packet < AV_PKT_DATA_NB; i++) { - const enum AVFrameSideDataType type_pkt = map[i].packet; + const enum AVPacketSideDataType type_pkt = map[i].packet; const enum AVFrameSideDataType type_frame = map[i].frame; const AVPacketSideData *sd_pkt; AVFrameSideData *sd_frame;