From patchwork Fri Sep 16 18:20:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 37965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1139803pzh; Fri, 16 Sep 2022 11:21:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Qc6U4IGoB0gJJC2mS/uTyKbyexkkouKL1CHe0koctVJXjQ2GqNaK5/JatI0iS4MRIlO9d X-Received: by 2002:aa7:d5d0:0:b0:44e:f6cc:7107 with SMTP id d16-20020aa7d5d0000000b0044ef6cc7107mr4910466eds.371.1663352470323; Fri, 16 Sep 2022 11:21:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663352470; cv=none; d=google.com; s=arc-20160816; b=Spfnp9G/hATXllQJYRqHbuXGyTWhZ5dlPHqfiEKyWTVhCrNuk4yyCLwG0vngN0hquQ 4H/mb6lMro+aa2WDFQ4AtlC0nJGb+id8cq8qkDw0DMM3ur2Ll0EZmHtvIbNZzhC8UPa8 FE/Y3F46nmoMxrIUOurT54gLtBZ3BZ6SlUlZZHigQXRUrHJTAepp37edGF/fUJxcVULf UnMiVDvM7NwGGDfGxSR9l5GWIJwciGienK11dZc179YN7u9Gh3LXVtVqzDBDoUtpywJC Pydq9B12BEmBxs4AxZPOvugErCfil6qQUm9jZ+VilA/tl97UgaFISChAzbiUuIcbrEnF zMow== 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=nP/o64dssqhvuARi7wHAHsJRPo75kzR/Ml94B9b2bXU=; b=ZfaXnEnIiaBXbhCfee6JYXmTc8CybsXtL7e+EBhMiq/4jTbYgLyzzGuZuETSRbA18/ RuAgQ6+bOHsyuzNuWimsSvStBbq0tv2H8/W9UAkqV6bQhU6JheT5CceQtfv/zBc7P2tQ Ht8z2yGx3oXtc7Ek+6jIbgVgHkcfSFSbdWeCAwZRUDQHYcH4sfak8NVUDRdyE+BnjWkb gAT5IRu6DVmwv8uCS6ifjmfB8K3nRuPbNzJMKHvSbX3NYwINzbWV4PvZIlS18c43XkeS MVIcdiOlUrvc4DglaNvhM5YBiZ8FYu4jz1xkyj2YczFMEZqgdjpbJZ3Ns57dVXOUi+Gn MHjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aYoPKm0M; 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 ww4-20020a170907084400b0077fb99b8cfcsi10266082ejb.301.2022.09.16.11.21.09; Fri, 16 Sep 2022 11:21:10 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=aYoPKm0M; 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 34A4D68BC0F; Fri, 16 Sep 2022 21:20:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2694368BC41 for ; Fri, 16 Sep 2022 21:20:15 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id q11so13301587qkc.12 for ; Fri, 16 Sep 2022 11:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=U1sdmHzyX7mYQQj5No0iIsfHzOL3gLnOWImNF88p51A=; b=aYoPKm0Muta+OdRHSvPnrI/hp0s9snqSxetIVLhCaYX1bQ8z84mJhSHP7UFU/3NyQ9 cvq+pSq8hDOxX1il5e3Iz3YVCWqRRuI04pm6Tq8C5D2aCLcNGyBwKDViMWi6YH85E5mw xq9tv+BaS3mp/lgt5mqeHXBxr/lO75VhScMcWSMKbqvpXNRm2Zxmgk64b7s1NHu1cFU9 +i/Y+z4gcP5REVwpgjQQ6g93dK/V++lX+yeYCRy3dvxQgWt22wYzFGtMkfd6zQUYJHd+ tcMUdhLDOlGnHCsEdSE8s8OUXViIjEY5T/Mcz1aiYpgSKlzqq+jJCzrfjYtGeF/QQw96 AqWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=U1sdmHzyX7mYQQj5No0iIsfHzOL3gLnOWImNF88p51A=; b=rBGZBJx3CPj1yv20E0oipJn4zZeWYiZiNRYjH1s/mIUVE1wDPDBmafIlfQIDFwZCER iAFcP0oev4kEg3wzxlax15PW7lYBHGPZOOA2f4VBP2s7y6Tj6XeVvA3D8VV7s7Rr4obm lUdNtyUObApoQnB/rzbdI9lWcIx9GVB8OWfVeaKA18XmM+O1M7J9OzerBJi3sSSd8BoO MM0l8/iBdhRbno/Pen5Z162+jn2zKEDKutw98X+6N15lla3ZpNH1ymO2sWszFFvL5nSI 1YsHfm//sSsV+TNCEG8mSWqYiOpFb/mGO/BiHDVTqGQE8cD/4gwdsSEDYz2lX8IbCrxX XpRw== X-Gm-Message-State: ACrzQf07tcEGRe7euGnzGwekF/+XmRSALAfKuhIHNZ280jYOtOpNcp8E OTrMQ75ZN8CUieY7j/iPrJIdxC9eMTA= X-Received: by 2002:ae9:ed90:0:b0:6cd:ef01:d3fa with SMTP id c138-20020ae9ed90000000b006cdef01d3famr4898390qkg.168.1663352413554; Fri, 16 Sep 2022 11:20:13 -0700 (PDT) Received: from scott-desktop.. (pool-71-114-80-52.washdc.fios.verizon.net. [71.114.80.52]) by smtp.gmail.com with ESMTPSA id l10-20020ac8724a000000b0035cb9531851sm5148098qtp.65.2022.09.16.11.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 11:20:13 -0700 (PDT) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 14:20:00 -0400 Message-Id: <20220916182002.122699-7-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220916182002.122699-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220916182002.122699-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: TSXd8JMO9M1K --- 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 b857353ab8..6a7af91fad 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1746,7 +1746,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 */