Message ID | 20200530160541.29517-3-andreas.rheinhardt@gmail.com |
---|---|
State | New |
Headers | show
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1F7AE44A6AD for <patchwork@ffaux-bg.ffmpeg.org>; Sat, 30 May 2020 19:06:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 039EA68AD79; Sat, 30 May 2020 19:06:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85F586898AE for <ffmpeg-devel@ffmpeg.org>; Sat, 30 May 2020 19:06:13 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id c71so6672606wmd.5 for <ffmpeg-devel@ffmpeg.org>; Sat, 30 May 2020 09:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Lh/CjjvsvvO2qZ3Z+Q83ET+OBiCGqn1dMl3DZ68I7w=; b=gFSM/xzhcGQE+DfIrtxrypO2H9gFvvnqLplnOmL83HkLZtYSB8WTS3BOXezK0tBNMD mRGL0sw7lehkdaKIBXfkMzxo7QKCBxyOgJPImn633Jpk2l3QhJ+wPm4PRBRj8rHuAFMw NFqzGMXix+vWWhrDwTwy+1A+HTSYhToPYd27NY4+AmFJ3k0IvyIxFg9i3Bd9H60DidVs n7cA8XnCR+gLHM8ax9uonnRx+rlet5+qtsjXlXG4+Q87pQAfuNExi5DdEgx40hS+V2na P8U36EeHb9IGz6qJaTLzX0N+hNxzIlrmalEh4fuzc+W0qnxZd9znZ1SivKg+fgKdwar1 B5zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2Lh/CjjvsvvO2qZ3Z+Q83ET+OBiCGqn1dMl3DZ68I7w=; b=Fk9zGJwnst74FQBYz2vJ4jIa24iNTu4w4WOYF8Mq4gKiSJWYOJnznTQlTTsmVDLyx+ PbCMKqNBCy4fUkM9gWcVt4HfIq8/nKTjP+nU5UXnNyP9N+WQmutXANKvFYfFZiCIsJR4 KfPk+oL9DkZ1kKLgdGKBQK5DG7NH6NnBvKZFSWbi0+eCGj9mlwKyHMu54TlIhmb5WmjX g2lehB3Sl3JIutoXohOZxiIs5M9DA7SHXJWsoIBJZT2kwvdTr3n+xuhZloaEqN+5svMm p33uMQUTyqmKj8pGRUgohMx3yA7EQRfeI4VPZYiDssNELxPeM5sRiyBqzAePGRlCF7u4 2igQ== X-Gm-Message-State: AOAM532Y2HhA3BLz79h0j6K4NE9Zr9fIEf8A5nrB6wJ7g2+B2NrEvoev fHJHT5sycc6G5BFBTGYRpBVMpK/b X-Google-Smtp-Source: ABdhPJysZPP2PAT24N41oYyQYk4OhYw1kGhVt7SRQOQCAhMQ2zrkq1qiyARtTydQoQhMNVxyqr4xcw== X-Received: by 2002:a1c:2183:: with SMTP id h125mr11980848wmh.88.1590854772536; Sat, 30 May 2020 09:06:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:11 -0700 (PDT) From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:08 +0200 Message-Id: <20200530160541.29517-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/36] avcodec/vp9_superframe_bsf: Flush bsf upon superframe creation error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
Series |
[FFmpeg-devel,01/36] avcodec/vp9_superframe_bsf: Check for existence of data before reading it
|
expand
|
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index d9c78c67f5..f330970acc 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -169,12 +169,10 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) av_assert0(s->n_cache > 0); // build superframe - if ((res = merge_superframe(s->cache, s->n_cache, pkt)) < 0) - goto done; + res = merge_superframe(s->cache, s->n_cache, pkt); - res = av_packet_copy_props(pkt, s->cache[s->n_cache - 1]); - if (res < 0) - goto done; + if (res >= 0) + res = av_packet_copy_props(pkt, s->cache[s->n_cache - 1]); vp9_superframe_flush(ctx);
Otherwise we might come into a situation where we have to reject future packets because the cache is already full. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/vp9_superframe_bsf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)