From patchwork Fri Nov 9 13:11:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10966 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 F27A944CFEC for ; Fri, 9 Nov 2018 15:19:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DBAD68A08B; Fri, 9 Nov 2018 15:19:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AB63689D9D for ; Fri, 9 Nov 2018 15:18:57 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id e22-v6so924036pfn.8 for ; Fri, 09 Nov 2018 05:19:33 -0800 (PST) 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=7vvSmv2voltgz7g3dZSHEqkGl4W/McLGkp5hCsYfTL0=; b=LtfPXtrNNow+vzGARqv6Tlv7iGTgU8NmvUnOVCgytXCfNtNd0oiblirC279bb/vbVb PmmLFxBMK93uWJeq3yLvnISXu1WoDzLmKUe1s3viBquRZl+RiA0fAjLE91r286asx6wy vFQeTwCIQx+AK4neeo/oZ3wjCnduEa5iJAwvYPzlrJ6scVW38SpAi9cvsSg9+cs6o8mC w3qPlQaMrgXNZJsLwc7CKc3leIEJrfz8NbnvSJLGAoRPNSLyiz17Anax/EK8AivBAabQ 3SujbK/ukXhqCvD9YsnWFO8aXVfw1UTi178KMPdhsT9mSaTPB7OqPhxL245WnZaN+KRU GkYQ== 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=7vvSmv2voltgz7g3dZSHEqkGl4W/McLGkp5hCsYfTL0=; b=ZGMVhHGV4sCbJFlI30iVKFjIbGw6pHOek6W6YM41G1fXXPIIXdEQnH6Awigj/yR4D4 9qfuMxkNlC4DgoKUDGagfM2yPPkgtABOag/dEh6h7mDent2PBmQGY3U038RlMxYNB8BR 1tZHODww6YYD9vFX/LretNfkP0neD/TwXbIIkR9y1zxpg7EuLeaSoq9i5/m1uykZtHqJ JL7U3syfviPVKvOO/jVXQ5u5u/A6xyPSdm9ln4lgNWhgvFBZBE/42XS3x2/atVP+blyL jt2SQuWEQMZKOXw2kHVJwq6IlYt/BZ+USEr3vjWtlvhtLtKYt2fA327n16cFK8COnulZ 8TGw== X-Gm-Message-State: AGRZ1gLcvhSeeDbKSRXlRX1n0eC+fqRsOPhJw9rSXYTW7zMVPV7W8vx8 2tN0WI0Yd0IuMxAEcA/DeV5L32iP X-Google-Smtp-Source: AJdET5dqsVuAwAaBQpNMaA03VGLi76/PFtM8xz6L5H+ALkp+1WWbjRxBfgjTGn480MOJXJCaQqBC5w== X-Received: by 2002:a63:981:: with SMTP id 123mr7473567pgj.444.1541769103074; Fri, 09 Nov 2018 05:11:43 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y71-v6sm7910175pfk.70.2018.11.09.05.11.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 05:11:42 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Nov 2018 21:11:31 +0800 Message-Id: <1541769093-31787-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1541769093-31787-1-git-send-email-mypopydev@gmail.com> References: <1541769093-31787-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 1/3] fftools/ffmpeg: Remove the micor like "#if 1" 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They are come from 2003 and delete them. Signed-off-by: Jun Zhao --- fftools/ffmpeg.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index da4259a..9dc42f5 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1210,11 +1210,7 @@ static void do_video_out(OutputFile *of, in_picture->pts = ost->sync_opts; -#if 1 if (!check_recording_time(ost)) -#else - if (ost->frame_number >= ost->max_frames) -#endif return; { @@ -2315,14 +2311,12 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, ist->samples_decoded += decoded_frame->nb_samples; ist->frames_decoded++; -#if 1 /* increment next_dts to use for the case where the input stream does not have timestamps or there are multiple frames in the packet */ ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) / avctx->sample_rate; ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) / avctx->sample_rate; -#endif if (decoded_frame->pts != AV_NOPTS_VALUE) { decoded_frame_tb = ist->st->time_base;