From patchwork Fri May 7 13:03:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 27651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp530932iof; Fri, 7 May 2021 06:34:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCLa8e3OsLejPN38V/QfnWsDOJBTt3AxXLHp9HIke80v9QBXRpTIUXEW49d0k4qhV6Ma69 X-Received: by 2002:a17:906:5584:: with SMTP id y4mr10023142ejp.120.1620394490472; Fri, 07 May 2021 06:34:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620394490; cv=none; d=google.com; s=arc-20160816; b=cl+q1ZYTet6ZafYZQBKMTOiL1aCXQ5DXDs50FTkNiJwmnUoXHHcisDr+tuHAf0B96G 87OOQwc2uBM+thboyv3KAb8+DKwMSY7AEUrPOIjOZWOYAk0YA4cW27V0rejHwYo8H38s kH9ueUjaOi29B5n++x1jaPha3oUQXujk1m7jnzdLHbSBQ73tEbSOe1KvhnWWpy3p1D4n hY0RwPooRQN1cGg9pk2uq7wVQf2op6IYY/oj8mFMEbg4nvYBIR+8exYwD6JBIkN03WId 6eJ8xq6P/zpHJZ3Z1oSk+uVukRVaKjAkZruNP2ymZkN2rMWBLK/4vCZ0/G0JheUz5Kkv qGYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=jcRdsY9CBYPQRvwkXH33iAcRzvGBHxp2HJgGLfKtcRA=; b=FpKlLQZHlrGaNrwmNkj1h3QRUfuHlwIyV+kFliMKZqny3/bnoKcw+AnCkRb0zZyfwl IRdpzdJuSbPpO1YJ79+F3HvVFo8Y2klmSr4liit1sHvSk+s9/Tgbyb3n4hDwfJvJ3RIk 4hG2Wtuv8U7E4F6QvYJZAs4zU9XrE2X00+RiuuWBU3Dypdpp+hZaxyWOvMW9F50QbbnB TkPv3yzWSGpZk9a3u5ES9t5wfnogDf9J5QB/mzI3Vk62dID/KSlxHe0JGmnDN1dWYMFF VyAqO+hi9suNP/bTZj98Dj2FWELxQlpspVVgqBCeln8c2yGWkVrCOIFTjzhX2OV9KwNr dYDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TaO8JzMd; 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 nb11si4725379ejc.133.2021.05.07.06.34.50; Fri, 07 May 2021 06:34:50 -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=20161025 header.b=TaO8JzMd; 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 385F7680815; Fri, 7 May 2021 16:34:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E0A96802EA for ; Fri, 7 May 2021 16:34:40 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id b7so11592492ljr.4 for ; Fri, 07 May 2021 06:34:40 -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; bh=fP1hNW0OmjeNLYbNbz0iI8C7Zh950BQS9NXowc3YU60=; b=TaO8JzMdYZpMjTilKBPE5WGqXQEnMMocdtD88eR2UEzwuxuhYKc50YqvRrOnd9PUv4 7Us14WccsG0Brmk57M1CwNwP3/eGuRfxv7uL2tv9yRWUfmjuhGYsA8bAmvJEremwUVmV f/vIorpmVrSg9Y6vxWZIZjPxpvx8liuQ7wjCcW4rVIGVGgylEumJL+WsdV1OIc1SXlQT 0cqtXwM5+8d1VkcAgUwO6zP04MIe6rrNHTPQBr0HOdmmgWoiTv8UCA6Dw6L5vDFXNmZg 4s6WoYJ+K/GuCgOKI3IDRFXKe6asONw4VZ1lGUED9SrkuYbnoBgDFt/B25X9/dlZ+0Rq YLMQ== 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; bh=fP1hNW0OmjeNLYbNbz0iI8C7Zh950BQS9NXowc3YU60=; b=h8dwSxRiCoFmMXmIlSyPKr57O8rlqdKs7RiObeaiEyH2TOBsEm89+xgKuZXDIt27c3 ne/m1ElAB1MP9FIQm3sNyZ40qypUpTXsVCjLkAWDiDUVyw93Tvs7WaWXrMWc8XIvtHV4 iNNO8hlqTCZ7s6dvVMG2fmc70xBdF2ey9JLSLcleR3kGzOlg3QZNG9mqFlCYp+ejDooT wJb8D2XS+zj2UMSBMZy0QjQboqFdHToGCbhHHPWcAtH21mflCpzsAcsYeAQ3G5BOrODT CFJCU73PqCixuegMATOOr0AZg7JelY7XV4KNH3lRa3VDjgU0qvLJnDyRB8tSOGR1CTaH eyoQ== X-Gm-Message-State: AOAM532LZYjnYL+8or9r0wNDm+FlxtZzNiW5UpCUKxe9yZbePstxkzqe dBwpgPLKEovq92K2JxJx+Lfk5IHE1fM3JNRH X-Received: by 2002:a05:6000:1c1:: with SMTP id t1mr12008162wrx.421.1620392627342; Fri, 07 May 2021 06:03:47 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id t7sm8288192wrw.60.2021.05.07.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 06:03:47 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 21:03:33 +0800 Message-Id: <20210507130334.31002-1-mypopydev@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] doc/filters: Update commands doc for amix 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kh9pAfSSSOkG From: Jun Zhao commit 95b854dd06 "rename sum option to normalize" missed command part docs Signed-off-by: Jun Zhao --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index b405cc5dfb..3d5aa8e8ef 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1947,7 +1947,7 @@ by this filter if this option is disabled. By default is enabled. This filter supports the following commands: @table @option @item weights -@item sum +@item normalize Syntax is same as option with same name. @end table From patchwork Fri May 7 13:03:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 27652 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp548636iof; Fri, 7 May 2021 06:58:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5JJEez64eoMLL4clPxNqwm6jOQ9wA+RpihdClDhDhWhAC52l4c2A6539IPg4jQH+p7fYE X-Received: by 2002:a17:906:d1ce:: with SMTP id bs14mr10264938ejb.183.1620395926651; Fri, 07 May 2021 06:58:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620395926; cv=none; d=google.com; s=arc-20160816; b=dCS8Ni9LK2mgYu+ElrixLs1A61I9I8grUx+hq5JWF+nMm3sN3Vz2KsM2sGdJBqpIIN ZZCrap20Pu1iTGgK/dL/GiwQL5YftqvSxrTKxiJnTdIPxkqmRvaaym6I4kWTq7ngKsdQ XvzETbfoD6HLorz2+iJLPqw4M++5TmCAB/JUQ/o1K+nl4t7byVR8ptGBRjGUBmqo3Vm7 1mXQdaqghj0IVPtPXn79CVAT2/ZgHVZN2028ZgNXLvpwPRsZaaP6sn2R7qU/Uasv0auZ 5HLDX1buKsuISobLEVxmjknRlCafiMNGopH0ZCVQMATngsxIvHqUWh4xPlRAAH002hah kqtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Q4qFEipYgDyjv6mDsOhoZqW7vq8RlJHre8W0R0GW8lg=; b=f/+VhUUMtFh4/ThjT8AfNcpic0rAY6x/6Gq28pDBCRFXSbMt6/SLgN6hGZY6nZqqSu /H95yGfgj4AeXTed7AbIIfT+sBF1KI1f/R5DiZdL0ssGQ+CikqGmtDW0E1ZHQWbJJCxa jVcE0a8opOwPfSA7iRnSwcp+XVGGccgfE6k6qBiO8SlYNzpXM+GMItyDLeDNvU27r30f QxAQNTSCABhi5+Uv/yfairj/Ih1Z4xoEB0kokpS4fVsbMQOtX5ZCdIrpuhOHWhovosuH cVCaMZs+yB7/u12ZUbopEpt1xuB4clXp5394B1pJsenZmSi10Eb5NdSWi3KCd5pYG5WK Wi/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=V1m97928; 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 nd37si4461532ejc.708.2021.05.07.06.58.45; Fri, 07 May 2021 06:58:46 -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=20161025 header.b=V1m97928; 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 3D4876806F8; Fri, 7 May 2021 16:58:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE8CA680305 for ; Fri, 7 May 2021 16:58:35 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id w3so13754001ejc.4 for ; Fri, 07 May 2021 06:58:35 -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; bh=M4vvcCO1+pYWEWQy54En9ipDdGq1NLm22116CsQ/9po=; b=V1m97928maCdFNcTGzzexYDTg6gKmtOuYZCHn4wW3RO4OfhkMyoYZStRJDxqPpYirc fuGADkGNGR1he33lgf3JjxZJgw9W16gqXzVkA1vehNuJs3r6C/1y/4Lge+RVGSLjSAfs BYkoemUEePizP3rX1SNnyVnZwiAVu+lg77YjLhvxiOjukro0eT4rB/K6vcD040U+STDO 6UY0k21duPjXncBX5qaA5wg/3GjhNn4sZTpGFh5jHD2O4mgRlQSiYORlyP0w8mNAYXTy vYF804XCUTQvGQuIhJE/QCitLt84eKVcZDdf1ElfJHv36yf29s4QAQ6RkW0IctlL+mFd d1iw== 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; bh=M4vvcCO1+pYWEWQy54En9ipDdGq1NLm22116CsQ/9po=; b=JBEWquXpqnisCt920/MN+9IFeJJaWdTgejRZxSUfo6uZyugynWH6/LaH3aS7Zdyq5a 83GfKD+ser07m6UY5FWyC+L4D2B2oApVewp0qelZ6mP3s+S6JF84rS5Hip0Clx23OatI PfiHzfOnry4kdUHlotN6/ih3raEsF+Fjd7vwcBIlPOXCDuUT69/WNo08JELCKNr3LqvF JMAMdP2pO+6Ion1B3m0yxMAfgDcxL5TU98GpH2b3HVcqRLNFlJBbLXc3CbT0+FLlhOcA 2fLcerPeA3kgEW1YZLCf0/Zm3c3j3dfAXvNc2awoa1QO8x/6emmPYEUmKSiiE6M49aLw GFiw== X-Gm-Message-State: AOAM533O8FrqiTRQ24Fu8G1hBEKnaUPkVAfzsxPBdPpKfqZ8tjbZK0GB oYQpP3/U8BFH2wUVSVz48XNDqYw0rmElJxTN X-Received: by 2002:adf:fed1:: with SMTP id q17mr12505805wrs.111.1620392634373; Fri, 07 May 2021 06:03:54 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id t7sm8288192wrw.60.2021.05.07.06.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 06:03:54 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 21:03:34 +0800 Message-Id: <20210507130334.31002-2-mypopydev@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210507130334.31002-1-mypopydev@gmail.com> References: <20210507130334.31002-1-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/mpegts: fix av_log use the uninitialized stream id 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5PXWMDISjscy From: Jun Zhao fix av_log use the uninitialized stream id Signed-off-by: Jun Zhao --- libavformat/mpegts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9092dbce72..722dae8e36 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2207,7 +2207,7 @@ static AVStream *find_matching_stream(MpegTSContext *ts, int pid, unsigned int p int stream_identifier, int pmt_stream_idx, struct Program *p) { AVFormatContext *s = ts->stream; - int i; + int i; // the stream id of the match AVStream *found = NULL; if (stream_identifier) { /* match based on "stream identifier descriptor" if present */ @@ -2218,6 +2218,7 @@ static AVStream *find_matching_stream(MpegTSContext *ts, int pid, unsigned int p } } else if (pmt_stream_idx < p->nb_streams) { /* match based on position within the PMT */ found = s->streams[p->streams[pmt_stream_idx].idx]; + i = pmt_stream_idx; } if (found) {