From patchwork Tue Jul 28 17:02:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 21344 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 194AA44A61E for ; Tue, 28 Jul 2020 20:02:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5B8268B99B; Tue, 28 Jul 2020 20:02:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-141.mail.qq.com [203.205.221.141]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F114B68B976 for ; Tue, 28 Jul 2020 20:02:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1595955764; bh=6vncrM8WEy2ZJm/qhehL3hnPRFVYG598B64Z7AaxlqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RZSTuuFLumh1u3mwIFJOFuKTsaKabndCXkidBUYB7qin3GZhAOhGjYHPculzI2kmh B60kszEB7wSxpRQa+pKy+2oC3FNpVGon3vtX0lI+DpIGkDH8mJ2PQDfVtYgmhjdxk4 OEIZeh+MPvxJIwGDwziU1hDwD/3yV+YBQQyqS2Wo= Received: from localhost.localdomain ([27.46.106.166]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id AA8B451; Wed, 29 Jul 2020 01:02:42 +0800 X-QQ-mid: xmsmtpt1595955763tz3eqvc1n Message-ID: X-QQ-XMAILINFO: Mhi/VOzNUsFXX4Ilc4akl0eWKU7GOfqSCgoAip81GUWLDlDYnyJckf07kQiqQm YgEZweVF1Y1BM4szOmvGpajr+N0J6nvTCnXpqI7dWgAcJjD9Cb+5aXmZv496PF74prZdf6ogCfr7 B+Ai36OR7fQoH+8rSIS2VtH+R+axV/oOt3gTTXBCxs/kvk1u9dVJ8ppAlToTAHNsmvgTnrcS/3+Z eXiRT++AFntHR4Kkw/yM7IBECczLiMFClckBh6mOTyi+thBqDjqzXsy8f+04IKSHblVUFPSOXTSr 6C3nzOsLS7mvlUHfCF0YqGsciRzMh2xw5ZSRH/PbJtP2aehyXbRuNE6jsQq1P8sJ+Opq4jjcKq4g 5Q3QR6QrifQW+nzBKZAO4BTzfwqRQMuiIFzlSn+2grqs1QqIJ20+stdKZaI1RNJfp7+YbOjiyaMe CJ1hZeezHT7nIiGwDVyBOHzBlqMvdc4My0p9Kh2efCsqxA+DSr3RKNYfyZo2yflgd6HTA4RNbQvK L5IhhVmLkTbzsRBtMg/r9v9PpO/cH4i8wflXouWBAG66ZOoXPuMWtbcmX1folMdVmeZFrXm/TBcV oXTdCgegJMxTk3zJBPbaYxie26AoNg5r6YwHUA6v8QSSgpUoE/918ha/6elafexChXm2Cp+588YX QA9NpDxwXl8TDUCbZg92MMH40+2q6WB41fqwOzZX2ByAFSRfP2e2WvXDRMN8pRwpkqf4kOB//ROv 1n From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 01:02:40 +0800 X-OQ-MSGID: <20200728170240.293678-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200728170240.293678-1-quinkblack@foxmail.com> References: <20200728170240.293678-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/utils: reindent after remove if() 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/utils.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index af1cca0c7d..88b69c6036 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2583,14 +2583,14 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, // Fall back on old API if new is not implemented but old is. // Note the old API has somewhat different semantics. - dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); - ret = av_seek_frame(s, stream_index, ts, flags | dir); - if (ret<0 && ts != min_ts && max_ts != ts) { - ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir); - if (ret >= 0) - ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD)); - } - return ret; + dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); + ret = av_seek_frame(s, stream_index, ts, flags | dir); + if (ret<0 && ts != min_ts && max_ts != ts) { + ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir); + if (ret >= 0) + ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD)); + } + return ret; } int avformat_flush(AVFormatContext *s)