From patchwork Mon Sep 26 20:36:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Agranovsky X-Patchwork-Id: 739 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.36.66.20 with SMTP id i20csp2109181itb; Mon, 26 Sep 2016 13:36:22 -0700 (PDT) X-Received: by 10.28.8.84 with SMTP id 81mr17599553wmi.22.1474922181780; Mon, 26 Sep 2016 13:36:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p4si10171648wma.39.2016.09.26.13.36.14; Mon, 26 Sep 2016 13:36:21 -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=@sighthound-com.20150623.gappssmtp.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; dmarc=fail (p=NONE dis=NONE) header.from=sighthound.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D69D689E52; Mon, 26 Sep 2016 23:35:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f169.google.com (mail-ua0-f169.google.com [209.85.217.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F6F5689B60 for ; Mon, 26 Sep 2016 23:35:47 +0300 (EEST) Received: by mail-ua0-f169.google.com with SMTP id n13so1443390uaa.3 for ; Mon, 26 Sep 2016 13:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sighthound-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:message-id:date:user-agent:mime-version; bh=b6N86yzpT0e+gDtxwgyvTT+/0HWVQV6IocrThzd1Bxo=; b=uwtigQJX4zspOk2vTLz22Rql/lBR2P/OGphenjpUGnmErz9/I9cu/qOVKXGxPyTCZh G6YdUV30IjPEoNowrpfi70BlKN4u03x65RPgO2gkRALtiT7LQNs9wqqgznxoEW9VS/Tg k9Ky50Mxghx4ZhAJ+aBorGvCzFPUnYAiT3FEOGxV7F2+f4Ne/4FImZ3kmU3cTKddXQ7a y4gRa+418OCj0DrmxzNvazsu0E28Nt41VlB9D5P0jXX+Y4u5fbx67mLnbuRMXBNgjAO0 ZqNx52fzxqEoKfSYBTP1EpYGnOwe+A4Yn5lzeziQSkxF0SguDjphAiQDTvgRcNv1OBoS fk4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version; bh=b6N86yzpT0e+gDtxwgyvTT+/0HWVQV6IocrThzd1Bxo=; b=B+C+PXHEKFVEkQMARbPmg+RQaoAlHgNnvBTHL7mdf0cj5+5xTQvri0wolROcmGemaM V8Df+jQRgVEG6kpFaGyn5/arAE85ghFAX5bjDQPA6JFFm0Jq+BsvBg3o8hBWL+k/M9CV ukgJQZXx2+qoNphmjYsTuKA6aTTM104xComNZ6jPyffLlSyUJHINO6XSNhoUIMb89rE+ X03scRPFhOWkm/uI5+qNS1T5FTL8edS7NqU+e0xQ0Iy9qTmNWzVy96RAeZxsrszMNlw4 M7++8YkaNWoXqLI+lx8xn/XYee5TL1pHnYzUfktkr/Ds1yAzSju0wV96ZHdZcgqPkBC/ FD9Q== X-Gm-Message-State: AA6/9RmbvwmMwqHe193DDgjc2hRLu8eUYSSvQUg93Xx7Hg33hwQWTYLYEhQy811ey4XvuJkN X-Received: by 10.176.85.148 with SMTP id v20mr339088uaa.26.1474922163096; Mon, 26 Sep 2016 13:36:03 -0700 (PDT) Received: from Mac-b8e8563840f8.local.tld ([209.16.116.250]) by smtp.gmail.com with ESMTPSA id a3sm44488uab.11.2016.09.26.13.36.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Sep 2016 13:36:02 -0700 (PDT) From: Alexander Agranovsky To: FFmpeg development discussions and patches Message-ID: <57E986B1.3000903@sighthound.com> Date: Mon, 26 Sep 2016 16:36:01 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Thunderbird/38.7.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_drawtext: fixed default/flt formatting ignoring offset parameter 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 9f183abbdde7fa50b9425165dd792d2770098749 Mon Sep 17 00:00:00 2001 From: Alex Agranovsky Date: Mon, 26 Sep 2016 16:23:45 -0400 Subject: [PATCH] avfilter/vf_drawtext: fixed default/flt formatting ignoring offset parameter Signed-off-by: Alex Agranovsky --- libavfilter/vf_drawtext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 214aef0..489db40 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -809,7 +809,7 @@ static int func_pts(AVFilterContext *ctx, AVBPrint *bp, pts += (double)delta / AV_TIME_BASE; } if (!strcmp(fmt, "flt")) { - av_bprintf(bp, "%.6f", s->var_values[VAR_T]); + av_bprintf(bp, "%.6f", pts); } else if (!strcmp(fmt, "hms")) { if (isnan(pts)) { av_bprintf(bp, " ??:??:??.???");