From patchwork Wed Sep 26 22:00:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10498 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp1234273jap; Wed, 26 Sep 2018 15:01:44 -0700 (PDT) X-Google-Smtp-Source: ACcGV60PQOGs8efmLjdnnh2dDQc0VhQkSARIi/7eQrfGzlKeJH/MiOlOO3pynW6e8ahn1Qs73Zln X-Received: by 2002:adf:f7c8:: with SMTP id a8-v6mr6826362wrq.86.1537999304042; Wed, 26 Sep 2018 15:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537999304; cv=none; d=google.com; s=arc-20160816; b=eQhD37MLrAU7aigblTABNX7Z3dF7DkJjreze3UQkxp+/v+Qu2Wo8f4wVtsuusoCQ2Y lsKpUipvS9ywUNymly00tF/mNeBXIulW0auPT3ZXhDVPOQtCYkxfoYX0fz422PhW7Cdi YQmhyk4XVv7vAO2p3p1zlOfP7CdgM87dPY+yeXy/yzB+MEACtpqQdEuprjJhIw9kv9VF mxqS6DzJaTsYEEaCFmxtqszMU6ksN4Ap4JF8UXOnEcGM9L2FHOcydA1A//vKdrtjz0go 3mJbmLZLC0QnssiDw4CeO1bgEBxEjXz67qwTOYt2regxt7BjxDbx7RkdWBQ1aXJegir5 hFxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=0tTKhcgGYSeYOhkJ5N5pvohs9ntnp1Dz8PYKs/G4tvg=; b=ZB0FBkOck+7TUTDaybv3s56mAlrLqDwBLscKN/674ukxzbDW/a7SdUZahGj6CcV+I1 OH+aob2a+1mFSR3diYOpk6C9fM/ARr67jrmp1eG7qxXqfd5uhJCugciaPA3jPeRJJYzg 5Nxq93nBIH/cWBhb/S1bKlm8FrWL6oS2r3hgCUbaFe2ZLOPay7BuPqxFwxMrbKsLrRq5 nvMZbcFvKYpLfyT/BE9zr1wFwSil6sgZ1e3oE5TT3N8SOFXh6DPV4VVuLpfhF8QOEU5g lhb6be5skTZxDUi5nwB0nSnBw3b0gM6089s6utnjhKSN84bDguS9Pgei3YbISfosQRMH WMSA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b17-v6si170574wrn.94.2018.09.26.15.01.43; Wed, 26 Sep 2018 15:01:44 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DF6168A570; Thu, 27 Sep 2018 01:01:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-3.mx.upcmail.net (vie01a-qmta-pe02-3.mx.upcmail.net [62.179.121.183]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9364C689B19 for ; Thu, 27 Sep 2018 01:01:13 +0300 (EEST) Received: from [172.31.218.44] (helo=vie01a-dmta-pe05-2.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1g5HsA-0007bO-7M for ffmpeg-devel@ffmpeg.org; Thu, 27 Sep 2018 00:01:30 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1g5Hs4-0007Z2-1T for ffmpeg-devel@ffmpeg.org; Thu, 27 Sep 2018 00:01:24 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id gN1J1y01S0S5wYM01N1K8R; Thu, 27 Sep 2018 00:01:20 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 27 Sep 2018 00:00:25 +0200 Message-Id: <20180926220026.29751-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180926220026.29751-1-michael@niedermayer.cc> References: <20180926220026.29751-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/utils: Do not use "i" as a context pointer, "i" is normally the integer counter in loops X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This avoids surprising developers. Its bad to surprise developers with such unexpected things. Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 7e5783c14c..c1835b1ab5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3461,7 +3461,7 @@ static int extract_extradata_check(AVStream *st) static int extract_extradata_init(AVStream *st) { - AVStreamInternal *i = st->internal; + AVStreamInternal *avsti = st->internal; const AVBitStreamFilter *f; int ret; @@ -3474,66 +3474,66 @@ static int extract_extradata_init(AVStream *st) if (!ret) goto finish; - i->extract_extradata.pkt = av_packet_alloc(); - if (!i->extract_extradata.pkt) + avsti->extract_extradata.pkt = av_packet_alloc(); + if (!avsti->extract_extradata.pkt) return AVERROR(ENOMEM); - ret = av_bsf_alloc(f, &i->extract_extradata.bsf); + ret = av_bsf_alloc(f, &avsti->extract_extradata.bsf); if (ret < 0) goto fail; - ret = avcodec_parameters_copy(i->extract_extradata.bsf->par_in, + ret = avcodec_parameters_copy(avsti->extract_extradata.bsf->par_in, st->codecpar); if (ret < 0) goto fail; - i->extract_extradata.bsf->time_base_in = st->time_base; + avsti->extract_extradata.bsf->time_base_in = st->time_base; - ret = av_bsf_init(i->extract_extradata.bsf); + ret = av_bsf_init(avsti->extract_extradata.bsf); if (ret < 0) goto fail; finish: - i->extract_extradata.inited = 1; + avsti->extract_extradata.inited = 1; return 0; fail: - av_bsf_free(&i->extract_extradata.bsf); - av_packet_free(&i->extract_extradata.pkt); + av_bsf_free(&avsti->extract_extradata.bsf); + av_packet_free(&avsti->extract_extradata.pkt); return ret; } static int extract_extradata(AVStream *st, AVPacket *pkt) { - AVStreamInternal *i = st->internal; + AVStreamInternal *avsti = st->internal; AVPacket *pkt_ref; int ret; - if (!i->extract_extradata.inited) { + if (!avsti->extract_extradata.inited) { ret = extract_extradata_init(st); if (ret < 0) return ret; } - if (i->extract_extradata.inited && !i->extract_extradata.bsf) + if (avsti->extract_extradata.inited && !avsti->extract_extradata.bsf) return 0; - pkt_ref = i->extract_extradata.pkt; + pkt_ref = avsti->extract_extradata.pkt; ret = av_packet_ref(pkt_ref, pkt); if (ret < 0) return ret; - ret = av_bsf_send_packet(i->extract_extradata.bsf, pkt_ref); + ret = av_bsf_send_packet(avsti->extract_extradata.bsf, pkt_ref); if (ret < 0) { av_packet_unref(pkt_ref); return ret; } - while (ret >= 0 && !i->avctx->extradata) { + while (ret >= 0 && !avsti->avctx->extradata) { int extradata_size; uint8_t *extradata; - ret = av_bsf_receive_packet(i->extract_extradata.bsf, pkt_ref); + ret = av_bsf_receive_packet(avsti->extract_extradata.bsf, pkt_ref); if (ret < 0) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) return ret; @@ -3544,13 +3544,13 @@ static int extract_extradata(AVStream *st, AVPacket *pkt) &extradata_size); if (extradata) { - i->avctx->extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!i->avctx->extradata) { + avsti->avctx->extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!avsti->avctx->extradata) { av_packet_unref(pkt_ref); return AVERROR(ENOMEM); } - memcpy(i->avctx->extradata, extradata, extradata_size); - i->avctx->extradata_size = extradata_size; + memcpy(avsti->avctx->extradata, extradata, extradata_size); + avsti->avctx->extradata_size = extradata_size; } av_packet_unref(pkt_ref); }