From patchwork Sun Sep 29 02:50:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15372 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BCF2E448B09 for ; Sun, 29 Sep 2019 05:51:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B4DC688362; Sun, 29 Sep 2019 05:51:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D6E8688170 for ; Sun, 29 Sep 2019 05:51:08 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id 5so9709503wmg.0 for ; Sat, 28 Sep 2019 19:51:08 -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:mime-version :content-transfer-encoding; bh=xhR9adajRlTMhXjf1ubN+g2LP74i0Tp6okYheTp2hp0=; b=UbOu7tUKLgwKDiaPELSyGbe9BFV0bVz8TEXOaWps+gz7untEpPfn0gCz95D9sfvY3c keAwS3ELCenubj9T48NcrzwbnpdmVW8W3zYcPQEc8uF9RYA51RedN4yrejDzPj8YKxNs Ok6mpjkA2pmVrPYtVwVvL20E5jGyCNmDz+Xz61G4N0YgMdpvmHS1fwZ4mCk4E8IR6ywl ekeodUjjtCRxcGk8T9dvSG0j6hD/S8So19cG8ki7kpfdGisehJjkV+RLd4GUoRf7lYcg l7z8K2G/moKdxm5QDbHgTX1/AY5Un0hH1jbIZGOadPyRXf7q95mly9nnuSLgIPRPcq1E gutA== 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:mime-version :content-transfer-encoding; bh=xhR9adajRlTMhXjf1ubN+g2LP74i0Tp6okYheTp2hp0=; b=PsVH1jwqkgwepINZAsrGJHQ1D77lxjc9dlehyfE5ldnL2YbMFSDe+sRpXwjGmU8CTc zwrA80QiFQn8Qxf1/nBp7Lb/fner2NuxfwjYJbdMTokl7gimfWjl/JRq2+WXtHPKiQgn UxQRtLrR+JcEZEYVPiUBC2wmCM2uHLgpiLTABkpKsqgcRG41dgaas3KB7ScyzE2T361p r8D7tD7Raq5HzARomkUKWAeEkZFYoXa9LOKrP72JcJ4BIOLpekcibMU2CW5ILGca9KBo PG6kKZyhH+op21k0u8nSdAkrZ5KrUNaz8bWiSRi1P8Fhf6XxjHGq3SXNjvEs9JlzwqRm QWKg== X-Gm-Message-State: APjAAAWzKNZ3WT6M+lsb8M3j9JLdZ4M/mVrZmM3LENqUhRhgGiZSeNxo JIuhnduCZ6kGsyGtjgy8+oGiL0cJ X-Google-Smtp-Source: APXvYqydgwXc8y5RpYlFi7g1jLgTTnqMbIjqea9mshJbq2hnk0eGhqIWUoZrMRjoqDzPNgjWDzDpDA== X-Received: by 2002:a7b:c44d:: with SMTP id l13mr11735868wmi.160.1569725467899; Sat, 28 Sep 2019 19:51:07 -0700 (PDT) Received: from localhost.localdomain (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id s1sm10392495wrg.80.2019.09.28.19.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2019 19:51:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2019 04:50:47 +0200 Message-Id: <20190929025047.51690-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/utils: Fix confusing return value 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Replace a return ret with return 0 to more clearly indicate success. Also don't use separate ret and err variables. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 7545d75d5b..f5034c684f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -832,7 +832,7 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in int ff_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, i, err; + int i, err; AVStream *st; pkt->data = NULL; @@ -856,17 +856,17 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) } } - ret = s->iformat->read_packet(s, pkt); - if (ret < 0) { + err = s->iformat->read_packet(s, pkt); + if (err < 0) { av_packet_unref(pkt); /* Some demuxers return FFERROR_REDO when they consume data and discard it (ignored streams, junk, extradata). We must re-call the demuxer to get the real packet. */ - if (ret == FFERROR_REDO) + if (err == FFERROR_REDO) continue; - if (!pktl || ret == AVERROR(EAGAIN)) - return ret; + if (!pktl || err == AVERROR(EAGAIN)) + return err; for (i = 0; i < s->nb_streams; i++) { st = s->streams[i]; if (st->probe_packets || st->request_probe > 0) @@ -917,7 +917,7 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base); if (!pktl && st->request_probe <= 0) - return ret; + return 0; err = ff_packet_list_put(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end, @@ -1597,7 +1597,6 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) * really terminate parsing */ break; } - ret = 0; st = s->streams[pkt->stream_index]; /* update context if required */