From patchwork Wed Feb 9 03:28:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1372033iov; Tue, 8 Feb 2022 19:30:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJx++71J8aLrils+hUFMWeaL8nFJSMe4KTV3buIQqXHgxhJiunvzP4YJi9y5f1X9WgOvza3A X-Received: by 2002:a05:6402:2754:: with SMTP id z20mr409863edd.235.1644377435999; Tue, 08 Feb 2022 19:30:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644377435; cv=none; d=google.com; s=arc-20160816; b=xctN1VuJ81nCZ3uC4ha9efjhmeRJSWWGJEEG8FjIQu8DanB27iRDNLsjRogTkf6yI/ gf7zoKjCkmvb9MDwi/PuRBKnEHC29nMM1t3C/kmRTBM2Cx9M29tvt9uDRvOsfjctnW9o wrIRfmJaeo8sRLGfmZdxHJf+kODV4vZo8Ps4QpJ+CUP4a0N1Gp/MrHqhB4DhOZ4/Scms l12kwL/w3SQeLH0KylcsF8DfOhwMReFniUxvQ4qm23ljp4ggJ8haejZS1UKaYs1+214h c3o4SgjKaE0hV+PFvTPIgEGm+8I1RGvM/r0478y3ZSQ8s13GXmKyyMVoUVuAtm5QsF1+ vtFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=8somVa71msxh7yIqs49oHTgVX1ERVA+/Qvx0lagIx8w=; b=TanRYZs+y9DkOFrlbIalfrqXTfijy1iAD/+oGE+LhOkv0BcaOpG5smMxfy5qDs94Es L3oTAlCbyXH4pBbLqr/CT/CTZ/47At3lv5B/bbLOzzqs222+sj6UKliULh+BMVePnY3M CNVH+tTa+a7foya9dei/97KMIx8vN8qRnlp56AmyY1Dm/n0g1HiriAo7T0cqHYL/KiwI t7h6lC059UhNx/4fuoSaBIMOtc3fRc+7QoTf7x7XakgRjd/anQLywPZrv0FHrAua7kB0 KWkfyucY1p6cdxCXOpCdLn4P3JryUnPG2i8Oh5dmEwKSHEE9+svjykIzSjukLHNQHKqV D63w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PxcJZL9a; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g7si1870762edb.109.2022.02.08.19.30.35; Tue, 08 Feb 2022 19:30:35 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PxcJZL9a; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57A0868B193; Wed, 9 Feb 2022 05:29:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4AC068B0EE for ; Wed, 9 Feb 2022 05:29:28 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id k4so840949qvt.6 for ; Tue, 08 Feb 2022 19:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ji7ATNk0mswiZcghW3xXnTq/PN51mpkUZXTeZr3x1e8=; b=PxcJZL9asX1FPCNjt2ag2gAbVIQ50unQZrL+MINgvR72AIUQGDdc7d9RrjO6NWDDVm yUe9Rk3PZTcvEynBJr3WgqjNJiw9hGWoLJVP14P0QxSQuFYHXnuM81DXn7x2l4hA2d2s nw70MPch+e90oWdF4oWvTrZNQ9veik0fP9lLbOxy3qOSlTDJvKAITz3nzVIuXhZa5ufe tlKZSjS8iYpExpEKrY9l5BS9g4Vt5OEQo04ocmQm65ZILXd/f0WgQAnOxuqtCFFCfvUK paqet9MKC2dWaYHFANNOjGlY1zZKwYTfozY4qT+KlddHIQfng/bvJAKqj4QRvkpcorg4 y+4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ji7ATNk0mswiZcghW3xXnTq/PN51mpkUZXTeZr3x1e8=; b=soWA2IpIlvFR6ttjnu2YFhoc9Bv9oldI8Bbdo4u3vjZgdjSunvBjslpzZViansxsIP Th5blI5/bUV0GQIldcVtr3LGEr9brUQUhyQBEAr/9opcs+YmvzXHCbRTYDc1AaiMEu9u SzMMRv24nLJO1hWSOnhzACq0UVMOC8hz6q7wrPqVh/uIJUSf8AYwc9v+yL+9FUZhVk0w 6LYxCAywoPsRRB91zLOg6krdPSpgTqJsenGj0HVW6MOvmBdH05+RrUxzLxtY2yFhS4JQ wJw1SwS6GZ2244kwReY86QKMqi+sq+3o4KSo4f2bzFocOdELNo+qf/dE5iotE92tJOqx gWsg== X-Gm-Message-State: AOAM532CTDS+60VYH1c/2MoBAvjqNXRC/eXJh6eJ+DeUQiXhTgD+5C06 Cke7MAd7/q1fIY7rcX/DlPLhfuZm238SgQ== X-Received: by 2002:a05:6214:b66:: with SMTP id ey6mr152700qvb.131.1644377367206; Tue, 08 Feb 2022 19:29:27 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id o19sm8452524qta.19.2022.02.08.19.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 19:29:26 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 22:28:52 -0500 Message-Id: <20220209032854.565698-7-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220209032854.565698-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220209032854.565698-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 6/8] avpriv_find_start_code(): correct type of start_code parameter 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: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HdXgaASCef/o --- libavcodec/mpeg12dec.c | 2 +- libavformat/rtpenc_mpv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 27fd61e848..24cd6aac77 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1768,7 +1768,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, if (avctx->hwaccel && avctx->hwaccel->decode_slice) { const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */ - int start_code = -1; + uint32_t start_code = ~0; buf_end = avpriv_find_start_code(buf_start + 2, *buf + buf_size, &start_code); if (buf_end < *buf + buf_size) buf_end -= 4; diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c index 8b6987b7f2..9c0816ef95 100644 --- a/libavformat/rtpenc_mpv.c +++ b/libavformat/rtpenc_mpv.c @@ -51,11 +51,10 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size) end_of_slice = 1; } else { const uint8_t *r, *r1; - int start_code; r1 = buf1; while (1) { - start_code = -1; + uint32_t start_code = ~0; r = avpriv_find_start_code(r1, end, &start_code); if (start_code_is_valid(start_code)) { /* New start code found */