From patchwork Fri Jun 22 16:39:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9481 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp1149850jad; Fri, 22 Jun 2018 09:47:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK4YNKx08sPBZe9wZftOeW3nZaV7ZkVJaabXfeRN5V2z5xIdDcB9Ss6CKEvGVr6hWnhtMLi X-Received: by 2002:a1c:8c55:: with SMTP id o82-v6mr2180913wmd.60.1529686053544; Fri, 22 Jun 2018 09:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529686053; cv=none; d=google.com; s=arc-20160816; b=SQtOczg54wjA3y3xvT9OjEWI2f85ArDOucjwgDxpAPxuaVNB8bYfHWTt06pxx5SnGV HsCMRffj8SRlp60Gonkt7pkYZYvqROiUriuXHokFm+yCJtWPq3p/8kOfUKWbDmtBFPdQ rTJUlQrJ1IzhuhywHAo4OMifHYbMBw3wKjejrvNZNnOlQqV4C39SvBLTRFRAtXyTtgyo H3QYAWZ2m162InppHvs6vUgucDZ4+PdYky8Y9ovvmJWhRdZjnWgZ/shjUBIwsZ/K2IHf OcmSIHsQOPyCAL8LUISRMgqjjn97KiJttk95wpzI4Bs23l/nuzqSzmsq6T3NMGpV0K3l Ym5g== 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:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=WF9wM9fiw8mBhCpJijBy0e8ns1nOMGdG7oU8qewcfsE=; b=TAsHSVrzqaJhlhxa5R8GwPAOJfihsRbGr4dNySF34HPu/wo4ekCq+TaIh5LEFNU+a3 WstqFgyheJWYA8Ob/YOlb8yKFT7kQfS7UIuGiEfCv/uZztpGnozTcYvdiVW7Gon6qB8+ 75CVGRFVW0rvzJtc+nUuPkVamiByhygzR9BW3IJ4OaEsY2Wb9kw+bDvlpQCW1Hb5gKs2 bDLjYAD4CaCy0mRGG1rgW8UiQgq+eLIOt3+qwdn0e8dCRMcyx2fkDA8bkjfhf4oTv86M QVVTYrLGBO3snknNzP9IbpBF07TeK6fj35B9bdxXYSGx3E0g4ZXeEGQSsJlU4OiJwILF doxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="LOr/KNjf"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s80-v6si1967247wma.38.2018.06.22.09.47.33; Fri, 22 Jun 2018 09:47:33 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="LOr/KNjf"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC119689732; Fri, 22 Jun 2018 19:46:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A876689732 for ; Fri, 22 Jun 2018 19:46:31 +0300 (EEST) Received: by mail-pl0-f66.google.com with SMTP id g20-v6so3769734plq.1 for ; Fri, 22 Jun 2018 09:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=rDLZpL1sZBTRljlMpzouHiG7SwjBvPn/OKs2DGENoPg=; b=LOr/KNjfPTtLHAubxWiHOZ4PuosKpwxkB+nvI7BjkWw1lx+6gmXub1dBpeLjrFkNUL gKn8MZ0vjhP3gSD6oAbVGWcN1ogGrId3CmHM3oHs4JQzw3/4dusxwhCzUsilMSArnbMX pm6SVsIpFbX1T+XwPV+5wUXkdRUbgGNQ001gLEXXZ6V+SI+Tf4mr2czxYsbmnEITpopx iZ6irWFEFzeQv+H1KZf6NdfgyMED2mQHNW2NxC+h6E1x9pPOM0ggyK5fUoQN4lITTYA1 vwNm59ftq+e+0uLKoOri1bGM4TckYXqtx/FRCpHK4OSDOPObshX1jlMUoVABDIpUtHUh wWLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=rDLZpL1sZBTRljlMpzouHiG7SwjBvPn/OKs2DGENoPg=; b=ZbxPBApx+tDmBm5515qBfTCe01nbt4dWiLLmJS13VasHEryJKKDt6teWnsgdNcTdfR raelSUJNE4actQ76/dUIJssVgdR1cN29/lFlmbmNcSjDQEP8fE1EDmggxjUaOIyDL3o1 Gw5hsbEhBS5XTqrdDiLoO9VZn9ElX2VWDER25vQg/Ng0t6Q16bYMbtn+YZ4vfGrIHU+s hp11WxiO3Znlch5Hei1ZeJFz2cOt7u3fN3eA+5c9hh7NjOmnlXEWez4zv8EC26VRnbCx v+RpdetDYL34CREcSRC1+OZeG8vAE2zCtJ8iAqdcSGtTw1gTIzAzps7As2opHyEsNR6C 66Yg== X-Gm-Message-State: APt69E2vrfONHw8lZsfZ4wp9MEtBUlY8d36zCEz+rgiJllaFkCdXbBxV FRjJ5nudPspWXBGg5h/omU4OlmBK X-Received: by 2002:a17:902:bb8a:: with SMTP id m10-v6mr2444931pls.236.1529685550293; Fri, 22 Jun 2018 09:39:10 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.246]) by smtp.gmail.com with ESMTPSA id y72-v6sm20156734pff.128.2018.06.22.09.39.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 09:39:09 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <0fce1010-f31e-5d82-8304-dbb0fc326c64@gmail.com> Date: Fri, 22 Jun 2018 22:09:07 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0001-fftools-ffmpeg-check-sseof-value-and-clash-with-ss.patc"; filename*1="h" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: check sseof value and clash with ss 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" From 326e15dcfc3ddb1d9b8fd06a5806807917f56669 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Fri, 22 Jun 2018 22:02:16 +0530 Subject: [PATCH] fftools/ffmpeg: check sseof value and clash with ss Prioritize -ss --- fftools/ffmpeg_opt.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index a2ecddae71..a5cedbcfff 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1103,9 +1103,18 @@ static int open_input_file(OptionsContext *o, const char *filename) } } + if (o->start_time != AV_NOPTS_VALUE && o->start_time_eof != AV_NOPTS_VALUE) { + av_log(NULL, AV_LOG_WARNING, "Cannot use -ss and -sseof both, using -ss\n", filename); + o->start_time_eof = AV_NOPTS_VALUE; + } + if (o->start_time_eof != AV_NOPTS_VALUE) { - if (ic->duration>0) { + if (ic->duration > 0) { o->start_time = o->start_time_eof + ic->duration; + if (o->start_time < 0) { + av_log(NULL, AV_LOG_WARNING, "-sseof value seeks to before start of file; ignored\n"); + o->start_time = AV_NOPTS_VALUE; + } } else av_log(NULL, AV_LOG_WARNING, "Cannot use -sseof, duration of %s not known\n", filename); }