From patchwork Sat Oct 29 14:57:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1220 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1579208vsd; Sat, 29 Oct 2016 07:58:10 -0700 (PDT) X-Received: by 10.194.78.195 with SMTP id d3mr15291598wjx.96.1477753089965; Sat, 29 Oct 2016 07:58:09 -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 yy1si20842470wjb.33.2016.10.29.07.58.09; Sat, 29 Oct 2016 07:58:09 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CFE9689934; Sat, 29 Oct 2016 17:58:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 267526898B7 for ; Sat, 29 Oct 2016 17:57:57 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id c17so11556726wmc.3 for ; Sat, 29 Oct 2016 07:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=1fbX67JdUaASxHJ7xshdYM7qJYFo69VK2ap21h9kk4Q=; b=wq9HEir1tzC21IocPcIaUOEYzZ3lmcILynYdtLuDqKtInAqP2kciLDlPQmP0YtfL+U Z2pabqDbU58/5pj+W89EIHw/rg3sZACAWmksAVN96sCaJtmJ7MqGa4gpT5C7kIhV07ZZ tTH29FXsRw+sRAvLW0Jh55PeNHYvqDjKZi8sFcOIlEdr3bYc0TgmuKgIAxSYocAl2SVf wvY09N3MQAX4H/nBN1aA+X59K3D4o3oG5B5aMVqG8YO8kGebHQvR2bQMxX3466jR+fTw ovcnRA2ihLrVcFCP0cgtK6xlks/iyZKT7i6VLOz4RH7fDP9vu3aHicDA38f+3dwzwEGv 377g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=1fbX67JdUaASxHJ7xshdYM7qJYFo69VK2ap21h9kk4Q=; b=NdCs9NGCRJC8QSBXQdNscoLMCvTZfzhAID5O8MNNyiiZGnH37WiCUuHiuHXWXjJWQ2 hD6uJWz+ztJ1nc/s8V2cf4XBPtrA19Elg0GKm/srO4aimLca8tIs2PCEBsDOZ18ItkD6 p94KikVYZQWjAGvQk8tj22GP+LGn9A0x2jJAxmTuGz5qQL3KgEt4UErX2/vUBRITt5tb agyfoh6qMRz2cA+vP65+JDnERQUgN7eG8kfji3UU/9aPZfbhkrc+9CmeRyqMX8UXtQO3 2mU/GutGAjaMXKA36GbzLz8pMreMd+enUPtq7+9oIF3fFIEEF6wCCFxZA39o5FAEPrzR zfig== X-Gm-Message-State: ABUngvfp/1dmf5JQn3krJ4JpMUE+ZJCI/wMbez9t+ApQ3te7wY7+WvopFcYp9mxCUtti2A== X-Received: by 10.28.138.209 with SMTP id m200mr3157628wmd.89.1477753079771; Sat, 29 Oct 2016 07:57:59 -0700 (PDT) Received: from [192.168.2.21] (pD9E8FF84.dip0.t-ipconnect.de. [217.232.255.132]) by smtp.googlemail.com with ESMTPSA id h10sm19763415wje.48.2016.10.29.07.57.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2016 07:57:59 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sat, 29 Oct 2016 16:57:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] doc: fix spelling errors 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" Signed-off-by: Andreas Cadhalpun --- doc/filters.texi | 2 +- doc/formats.texi | 2 +- libavcodec/4xm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c37fa29..1ebf251 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -9665,7 +9665,7 @@ Scene change detection method. Scene change leads motion vectors to be in random @item none Disable scene change detection. @item fdiff -Frame difference. Corresponding pixel values are compared and if it statisfies @var{scd_threshold} scene change is detected. +Frame difference. Corresponding pixel values are compared and if it satisfies @var{scd_threshold} scene change is detected. @end table Default method is @samp{fdiff}. diff --git a/doc/formats.texi b/doc/formats.texi index 5ef7fad..87704af 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -63,7 +63,7 @@ This ensures that file and data checksums are reproducible and match between platforms. Its primary use is for regression testing. @item shortest Stop muxing at the end of the shortest stream. -It may be needed to increase max_interleave_delta to avoid flusing the longer +It may be needed to increase max_interleave_delta to avoid flushing the longer streams before EOF. @end table diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index a7a757a..5547dfd 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -532,7 +532,7 @@ static int decode_i_block(FourXContext *f, int16_t *block) } i += code >> 4; if (i >= 64) { - av_log(f->avctx, AV_LOG_ERROR, "run %d oveflow\n", i); + av_log(f->avctx, AV_LOG_ERROR, "run %d overflow\n", i); return 0; }