From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7C1154E4F8 for ; Sat, 3 May 2025 17:55:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C72268B6F8; Sat, 3 May 2025 20:55:45 +0300 (EEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CBA1687D93 for ; Sat, 3 May 2025 20:55:38 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso13246765e9.3 for ; Sat, 03 May 2025 10:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1746294937; x=1746899737; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=+JraazUeQAbLrYIpgUvMmY+B08+EwVpH7kvTXtRz3P0=; b=1MDpuWaPY3LxFiFMFzK3eOHFbyqo6XBvW0Qx4cQ9kew9vF7PhZIfkf4w2VxS9D+ta6 Xy56wUFe86kWYdl/ZhR/WQRHF4Y/C6P/gTpWl+YQ0gnEdIuiyZBGTNaKOV9dev9Q9/GL i3F9NZZyRc71P90MIPGwK858JWNLT9rejmezSAkVly0i42pop/tYiEMCuFyFj1o6SBG9 kfhPvaleOBP6i9zm9vFV1fTWs+j8C2FAXRTIfF/kfrNsx67d8295RPSMcG7oNVitfrpr X6b1txZrC+PLlc8oBRf1YkSoWJJjV4C0U83YI6uZdNWXzcK0ROe+lCAkt3dGkgO3Zlx/ SxiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746294937; x=1746899737; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+JraazUeQAbLrYIpgUvMmY+B08+EwVpH7kvTXtRz3P0=; b=ECwK2mpSQSLgqwnGws86tO9hfrFOHHeexgZS2trFBSPCl64BHWyi80nkPmCt9su49k 5mSVn8ZWDrKcX0xzOg+debrK+6pUOSHg9gxwe+xOTQEHyZ1KyiqEmcDO7DN9/LaIFFM7 2Ui3y1ThPkL+Qn9SzhDsMQGNtAPXNkR34V+brBqN9FoP4DHehuzo4sSlkRW2URJkc9yF g1ognYi03Df3XCblHzswaQ67RCcoH778QE5Q6cjXcSIAB9MfYcW7InYiBnRdBJ2/X5/8 tc656B4aeFWHIxECQiJb/0S2nmdtwPzO9zu9qNUfnTCFW3gLpf53mF14v6tm7qMREDnG 7mZg== X-Gm-Message-State: AOJu0Yz1nAUVDx7J7pBIrFbvglj6YIkbLU/aUxbdhzmouFV98bQgVDxm mgAvCZeAcXtHGw60vIW2/7JVmGTRT0El7QeN6QtQi0OESm7+fPsP7x4JawrHu2Uvj5UGCt/PiWo R9gWYGQ== X-Gm-Gg: ASbGncvOd1aizbSpAlyeC1fphazWYjKqnixSLJBjKC5JnFiwy68r67LFm1Sce5Dn29l xWiL/i2lfL4ZUuFSxwdl0X0404DjrTod2oTCAjcUb8uaQze7I34M4aZ+mNID3EI4kN5JV46bOUu WTT4l6Zd1krdlBxwmAGHb5V3VA8lKtsXo25UfikDrEWGQnDf1uhSzLXNnzYCK7RPPGhSQyAF//8 /SjuVVEqTg0BctQzS559+lMUvjjIyDSJhJVUUULhjIBPaPMZ/xI7IVo/VLHnjOOiMB3AcPsiDgm XYpzGU1LYMNyHx0Lw8wcPvH/tu/aIdVZSYrr4bRoNcQ8iTyao2wO/ObAStNNuH09DSN3IOWhHwh YRoK6kV4QtCtWJiCtAlP9wNOM2/HDrlRYrA== X-Google-Smtp-Source: AGHT+IH8cCh1UVJeksxPCiaGRnKYlKYruwSEaqNBIw0qaUud224DjhCQ0nNKwhQ8Pmn7D6VJfPddOA== X-Received: by 2002:a05:600c:a08c:b0:43d:7413:cb3f with SMTP id 5b1f17b1804b1-441c1cc47ebmr29284135e9.5.1746294937278; Sat, 03 May 2025 10:55:37 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust719.5-4.cable.virginm.net. [82.13.66.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b8a3156asm80683645e9.38.2025.05.03.10.55.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 10:55:37 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 18:55:17 +0100 Message-ID: <20250503175527.1517092-1-sw@jkqxz.net> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] cbs_apv: Always restore tracing state on split fragment error 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 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: Fixes CID 1646769. --- libavcodec/cbs_apv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c index e7dd04825c..ebf57d3bbb 100644 --- a/libavcodec/cbs_apv.c +++ b/libavcodec/cbs_apv.c @@ -230,14 +230,14 @@ static int cbs_apv_split_fragment(CodedBitstreamContext *ctx, err = cbs_apv_read_pbu_header(ctx, &gbc, &pbu_header); if (err < 0) - return err; + goto fail; // Could select/skip frames based on type/group_id here. err = ff_cbs_append_unit_data(frag, pbu_header.pbu_type, data, pbu_size, frag->data_ref); if (err < 0) - return err; + goto fail; data += pbu_size; size -= pbu_size; -- 2.47.2 _______________________________________________ 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".