From patchwork Thu Dec 22 13:16:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 1887 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp641463vsb; Thu, 22 Dec 2016 05:16:40 -0800 (PST) X-Received: by 10.194.171.66 with SMTP id as2mr10479675wjc.77.1482412600433; Thu, 22 Dec 2016 05:16:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z84si28126644wmg.75.2016.12.22.05.16.39; Thu, 22 Dec 2016 05:16:40 -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; 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 082B268A395; Thu, 22 Dec 2016 15:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF529689AE3 for ; Thu, 22 Dec 2016 15:16:30 +0200 (EET) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id AB519817A1 for ; Thu, 22 Dec 2016 14:16:30 +0100 (CET) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Thu, 22 Dec 2016 14:16:30 +0100 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Dec 2016 14:16:30 +0100 Message-Id: <1482412590-16131-1-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 1.9.1 X-PPP-Message-ID: <20161222131630.438.67108@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com Subject: [FFmpeg-devel] [PATCH] avformat/avidec: clean-up identifier names 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Tobias Rapp --- libavformat/avidec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d465965..5b2d1bb 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -160,11 +160,11 @@ static int get_riff(AVFormatContext *s, AVIOContext *pb) return 0; } -static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) +static int read_odml_index(AVFormatContext *s, int frame_num) { AVIContext *avi = s->priv_data; AVIOContext *pb = s->pb; - int longs_pre_entry = avio_rl16(pb); + int longs_per_entry = avio_rl16(pb); int index_sub_type = avio_r8(pb); int index_type = avio_r8(pb); int entries_in_use = avio_rl32(pb); @@ -179,9 +179,9 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) int64_t filesize = avi->fsize; av_log(s, AV_LOG_TRACE, - "longs_pre_entry:%d index_type:%d entries_in_use:%d " + "longs_per_entry:%d index_type:%d entries_in_use:%d " "chunk_id:%X base:%16"PRIX64" frame_num:%d\n", - longs_pre_entry, + longs_per_entry, index_type, entries_in_use, chunk_id, @@ -198,7 +198,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) avio_rl32(pb); - if (index_type && longs_pre_entry != 2) + if (index_type && longs_per_entry != 2) return AVERROR_INVALIDDATA; if (index_type > 1) return AVERROR_INVALIDDATA; @@ -253,7 +253,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) if (avio_seek(pb, offset + 8, SEEK_SET) < 0) return -1; avi->odml_depth++; - read_braindead_odml_indx(s, frame_num); + read_odml_index(s, frame_num); avi->odml_depth--; frame_num += duration; @@ -950,7 +950,7 @@ FF_ENABLE_DEPRECATION_WARNINGS pos = avio_tell(pb); if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && avi->use_odml && - read_braindead_odml_indx(s, 0) < 0 && + read_odml_index(s, 0) < 0 && (s->error_recognition & AV_EF_EXPLODE)) goto fail; avio_seek(pb, pos + size, SEEK_SET);