From patchwork Thu Feb 3 18:44:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2741665iov; Thu, 3 Feb 2022 10:46:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4V24RkeA3dXD5rueT6SYo/qu1f3AmGf35zedG3PpMZZ5l4zN9u5UgDHvhGKkzvAoEu2rD X-Received: by 2002:a17:907:6d97:: with SMTP id sb23mr30925581ejc.17.1643914016788; Thu, 03 Feb 2022 10:46:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643914016; cv=none; d=google.com; s=arc-20160816; b=qRVi+LlaGDJyjFtn9BoZNsXgZPJrYNphzmEJY/BqswiG81pvYcC9rj8prMWovMxjS3 wmDQ95+CtxDog4Mq6ZAICvTW5nFL+nfQcKg888D632ahoYMCv/DnaEom4mey6iyIBrk1 Zxks7NaxeUjv+4gBNOJ7h+MZTm5kcQRrJF16RYiZkIRyRuoxGQ+mVklQOyY9nyQFEhLR M9eyv0d+BXA4O0D35rpXa5SOU2cL3mHLYkBTqhv0xYMwwbK68OaqAFCO4OpyZZDk/CWh Npd+w8h31qXyMeTzzHTKzvy9Mg+TbbXTonvUqjJT2jAU/diz/ys5A0ZP3KmwgCoeoPmO LuzQ== 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=CWb2cKpqjHq6AOqgkyUUg6uMoOlxCC2FVNDHHQaMOIg=; b=a/qT0nokLeHV0e/sR470/3PEdRRlP+QBOJW0b48RALCKmWPdmb3qFWp38FR9m5EfZD oD0sraeK1ZacSieggMI7EEZc/HAaHG4r/KNfH+PaTW3yXqREjJeUUEc+qkvRv8aGYCnk 5aZmX6gW8Fl/oMp5HxMo3fjXESLbjxb58rkOVieb1l2SRyHVUR0NTW2AcmoDQZMl0AxM oWqM7hp+GUvzsPUMTppehHE3CRfGKVOh1Qxp2KzISPDOVmMX8Rww2lQ2nYwqilmDgP+q rOwDVKnRv2geoQHU8QO1aX5gzkSnBnsZrhDn4sB/wsNvRGbLChaDPits1mDDFT8N8x7G fi8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="JOTJ/6YT"; 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 d1si14242031edo.142.2022.02.03.10.46.56; Thu, 03 Feb 2022 10:46:56 -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="JOTJ/6YT"; 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 E62FF68B0E8; Thu, 3 Feb 2022 20:45:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0659E68B143 for ; Thu, 3 Feb 2022 20:45:35 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id o9so3319670qvy.13 for ; Thu, 03 Feb 2022 10:45:34 -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=Szv76eCvdT2ogyZw0JAi9eTdiMBsNUyEjOMGevN1vIY=; b=JOTJ/6YTqXUCXLpbe9v6ul6MaH21jJTXq6AOv+cdlDDIqelAHezM197KtBKyKI9ZoS 4Hs9LuxOBw2XUdGhNK23wYQ7IE0whZl7THa1aGhl75w458UIFFyrE1C7LoVWzxVspdPA b492do7d6SiqY+YjH4Aj8PfZDxrfgi6UmK0Qr+flDkey99ee2S2XzGYkJE8mx/8sc5jx ES2jA+zSYYHivQfatjXgKWgdsSU6/NAeFmJFb6Eys4C042+LxNmznALfgNJz9qakkdjy pa46eLPzSIdmlPfYZbOr/qWkC5rC2TpOAWfd+s8dT0Rycea2VQOTxxnJ3vLkwblGiGZT wtBA== 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=Szv76eCvdT2ogyZw0JAi9eTdiMBsNUyEjOMGevN1vIY=; b=f7bL4qItnew+QvCKmdKNBFzmAtvP6YWrZktLN+GZ0wpdVZB/E3D16aecTQeXxIesXz dean2SkM8ZuxWv4DieSBgIcDLymavRG/xBB/7aFAsrZpAl19KJNjO1qZSzk5Yel8DV6b FxsK0KsAN2soYNsgTNJmaVXNbZ69Ew1MIcGYVRMdTmyXy2Xg5VHm6FBVKoupb/sX5sMS CY/VKmMoyp/FmINNRFhRqBngUsd+so7nwf5a5JKNxIJwgRgeR+3wdW6f9NxBrlJIUFEs +oHCTb1ZwyiPW+15DGRbT8quQ46dhVCMVmDKpmOsLxmFOmMqW6dscbF7CfdH7Z3KglRh N+tg== X-Gm-Message-State: AOAM532Jv6YNPNdSQTmY7OYhTK3OYDyth7UBoh1oSk+0XHN9oXXI8Oci G2x75FNRUf6O5rfEWkkA3/leZvL4xwhU0w== X-Received: by 2002:a05:6214:2428:: with SMTP id gy8mr32766190qvb.122.1643913933608; Thu, 03 Feb 2022 10:45:33 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id f16sm5947887qtk.8.2022.02.03.10.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 10:45:33 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 13:44:43 -0500 Message-Id: <20220203184450.5491-7-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220203184450.5491-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220203184450.5491-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 06/13] 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: Dg1l5FRlpsGJ --- 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 65b66d11f8..6b0b84ae64 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1770,7 +1770,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 05a77fa11c..91c07574bb 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 (avpriv_start_code_is_valid(start_code)) { /* New start code found */