From patchwork Sun Oct 9 10:57:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 920 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2047549vsd; Sun, 9 Oct 2016 03:57:59 -0700 (PDT) X-Received: by 10.194.52.3 with SMTP id p3mr28918191wjo.55.1476010679380; Sun, 09 Oct 2016 03:57:59 -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 cl2si30726224wjc.149.2016.10.09.03.57.58; Sun, 09 Oct 2016 03:57:59 -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 157E9689B35; Sun, 9 Oct 2016 13:57:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0A98689B28 for ; Sun, 9 Oct 2016 13:57:06 +0300 (EEST) Received: from paradise.fritz.box ([80.144.19.106]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0Ltr89-1av9420DuX-0118Bi; Sun, 09 Oct 2016 12:57:23 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Sun, 9 Oct 2016 12:57:01 +0200 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: <3e5a66db2817d8ea4dbd3a1eebbdb8fc5f98bde9.1476010504.git.barsnick@gmx.net> <5bcc1f72bb0f02e5eaf593f9332547ba30d9a8df.1476010504.git.barsnick@gmx.net> X-Provags-ID: V03:K0:XxJBp2NE4a9+QzkVr6ZwtkxIskVl2HwW9uMztndIFzQhnwySwol ZODIkGQ55II10xGofrEvzSyrgGLWG2QR4q6QhoLeiE1B2QQlUmiYbA4F3x0h4vBYCB3p58v 3XbPL36lDb5zuhvBKehkUGZMWyRej8FYRAOvmklk3whX/e5TRbK+adIOFwIU23OBo+dprCY Pf/r5aKWlki6WzSi5H+2w== X-UI-Out-Filterresults: notjunk:1; V01:K0:zVUz/jMP9G8=:UjLgIzRb6kC4acz5dXcMNf WAlhA4vwBs3EkD2/fM5CPvGg90pr0HU4TIbxcRN3zhez2Iu5XigMmdHPIxxcIvO70QEJDy3b+ Jahy9uV5yf7iTuJjLXj5rJF+o3V3lHNMsjsIw6inkLddUcW+OfcKLDdSaDlOLe5yRrt0ErQwu SYNn06BRMr56xMiQdLKed3BChFO1jgWiLkvzwdUNUlUeioBd+JP4bZLEE+rIoCurnyBpU3fjS cV97qIw9wvdqMdLu4fi4ZPTuAeaS0JGaOKfsbiq1Dfy+c+na0fqR26eiH8mxdrCnnMhThcGPt ZUa82Eu5QdzCbvPBELqdePlmAIr3zqiC6LGFWjVvN1/7eoQhX34W0aI3dRPVHL5oLAvu7p6sp UsQEtuTxcxJvTqTL3VeSGljwhXL1xlMzCW221ONN/X73Fuj4F1ThjgODVAwqklsyexRePBtqJ 2gdEKfa5u72u9+E1hM43GwnCfsjjqJeokbWezAFWDXAiA2JcFrGb29M36+1Fy39XqCPe8jIrz dupDrTQqjpZPWnyLoXq178B66FSUB8kHltam7RL5TVnCJ3RxVJURPc54dAjUBmtpqPow6nOSi h59t8VRg8/K6yRO6/PcMLiR57wepalTA9R7xI1SfiGDncMkhSdp8tQxnUJ+vLQaRt7furK+Sx yhe1VvTMJp6tSna2xugVXkzlAY4t7ZDOUFFzcWQNgF9CsOAbNl1KFP/0vaLeiQmII0qvRVOR/ G633Dr/yNBlJAgHNelum8RBOiW3PgDu6OoDwKpVsg99g5nXqdQNY/ew6LiU= Subject: [FFmpeg-devel] [PATCH 4/5] lavf: fix typos 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Moritz Barsnick --- libavformat/hlsenc.c | 4 ++-- libavformat/oggparsevp8.c | 2 +- libavformat/swfdec.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e0bb44b..9ca2df7 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -516,7 +516,7 @@ static int hls_window(AVFormatContext *s, int last) } if (!use_rename && !warned_non_file++) - av_log(s, AV_LOG_ERROR, "Cannot use rename on non file protocol, this may lead to races and temporarly partial files\n"); + av_log(s, AV_LOG_ERROR, "Cannot use rename on non file protocol, this may lead to races and temporary partial files\n"); set_http_options(&options, hls); snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s", s->filename); @@ -686,7 +686,7 @@ static int hls_start(AVFormatContext *s) } else if (av_get_frame_filename2(oc->filename, sizeof(oc->filename), c->basename, c->wrap ? c->sequence % c->wrap : c->sequence, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { - av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try use -use_localtime 1 with it\n", c->basename); + av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -use_localtime 1 with it\n", c->basename); return AVERROR(EINVAL); } if( c->vtt_basename) { diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c index 6716dd2..c534ab1 100644 --- a/libavformat/oggparsevp8.c +++ b/libavformat/oggparsevp8.c @@ -84,7 +84,7 @@ static uint64_t vp8_gptopts(AVFormatContext *s, int idx, int invcnt = !((granule >> 30) & 3); // If page granule is that of an invisible vp8 frame, its pts will be - // that of the end of the next visible frame. We substract 1 for those + // that of the end of the next visible frame. We subtract 1 for those // to prevent messing up pts calculations. uint64_t pts = (granule >> 32) - invcnt; uint32_t dist = (granule >> 3) & 0x07ffffff; diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 3268c0a..b91560c 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -518,7 +518,7 @@ bitmap_end_skip: } skip: if(len<0) - av_log(s, AV_LOG_WARNING, "Cliping len %d\n", len); + av_log(s, AV_LOG_WARNING, "Clipping len %d\n", len); len = FFMAX(0, len); avio_skip(pb, len); }