From patchwork Mon Aug 28 12:03:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4864 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp2184733jao; Mon, 28 Aug 2017 05:04:04 -0700 (PDT) X-Received: by 10.28.152.69 with SMTP id a66mr231274wme.58.1503921844711; Mon, 28 Aug 2017 05:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503921844; cv=none; d=google.com; s=arc-20160816; b=k0t6o2Gc3+fZqS/onv2MAvInKNNLnG+UUi/j+D/BaqyDwQM5nJ+Zz1a+uxLrFAR/jz p/eoE1uqmVQqb72FgumZzm7LlX0T5ArjBU5h7fGg2dkKRAzr3g8ViuABOeDQck0wjZYw ORcwg9hYH2Kf/6+DAsjlq9b4Pvr1uMYggOXHxBzEuSCxFPd12qgTZA8v81PVi0Fw7XWf VjXhhaUGBc7FKvJvNCUCuOkHLfqPhmWY2kQexb5YnOx0BlkCeq6+BaUq6wEkOD+mAkKK LPCyhO5Cj/WPIgn5GUTWYnQE1A9lOxbuLq2yx5KiyQLwwsS3/MNrL5PqIcliKzlTb1tG r5Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=L1ni2rIHR+ycnTQTfDdKAZ0pFrih707Q02xPKmM/yKI=; b=jL21WyFmYXRZOB6lSlHl8cseQwhzNOICJr8UADNnD2fR/vyEptyyAr87ddmskWcyR4 3Sb6bbNkPD29JfEwTGsgrDAEOQOnrnBT+jdCDJvqz0Cc+ckKewaZ6oTQiUCIsHbFp37f SrTGVx1yoXwPXF2mUWlRsvpNdmH+6qf8RJ2iIQ16QZo8CYMiBDw7mzzlMGK3i+IZYrKU ZhoZT4zElfJO9NQyLnK91TvSzPt6HnI7UZk2XL4IDDp4b9qQOdF9uWqY41rXsM6MYjqc OVuLDwx4VE47JXmmYi2bTCz3G3fAE1UXmQlgvNJCSzpW4RA+BC1/gRKTj6ViGYku0fMP /TIw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k17si219556wrf.23.2017.08.28.05.04.03; Mon, 28 Aug 2017 05:04:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B803689E7F; Mon, 28 Aug 2017 15:03:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEAB3689E75 for ; Mon, 28 Aug 2017 15:03:43 +0300 (EEST) X-QQ-mid: bizesmtp14t1503921825t7u70u80 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 28 Aug 2017 20:03:44 +0800 (CST) X-QQ-SSF: 01100000004000F0FH50000A0000000 X-QQ-FEAT: NviVax2pLsUaJmlZpxoW9cF915weAjockKDVQv8ds0cQZBtZcOEVaichTPQj3 3vUCNRepAs4Sx/qqNG02LUCI8m8c1L3EllMWySibtf4Takjgeu7Stht1AAPRf8kGL6ucZzJ xdppTGDlt9K6trioXPTdG4o4K6pw+hxsOiWz3w2UuaI/gVl4+nowd9449eFY6LLkXN4TebT VonGHOfwi/fd3wMWQ98wTfT4O5EKY020lMvIehsF4shu7XlV0cYLWmsoKrnYSgkqx/QohhC +EdrjbvnniUX+EM3bDUhumWsY= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Aug 2017 20:03:36 +0800 Message-Id: <20170828120336.23684-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/utils: refine av_get_frame_filename2 function 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: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" support parse the l for the %lld or %ld Signed-off-by: Steven Liu --- libavformat/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 23865c88c4..c76a6cc5f8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4570,6 +4570,7 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number if (c == '\0') break; if (c == '%') { +ignoredl: do { nd = 0; while (av_isdigit(*p)) @@ -4593,6 +4594,9 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number memcpy(q, buf1, len); q += len; break; + case 'l': + goto ignoredl; + default: goto fail; }