diff mbox

[FFmpeg-devel,01/11] doc/indevs: fix upto typo

Message ID 20181231210318.6130-1-michael@niedermayer.cc
State Accepted
Commit b33de557470471fe5d3a07fb441ec3f548f1d50a
Headers show

Commit Message

Michael Niedermayer Dec. 31, 2018, 9:03 p.m. UTC
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 doc/indevs.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lou Logan Jan. 2, 2019, 7:34 p.m. UTC | #1
On Mon, Dec 31, 2018, at 12:03 PM, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  doc/indevs.texi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Ok.  Same typo is in compat/avisynth/avisynth_c.h.
Michael Niedermayer Jan. 2, 2019, 9:43 p.m. UTC | #2
On Wed, Jan 02, 2019 at 10:34:21AM -0900, Lou Logan wrote:
> On Mon, Dec 31, 2018, at 12:03 PM, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  doc/indevs.texi | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Ok.  Same typo is in compat/avisynth/avisynth_c.h.

yes, you should probably report this to avisynth or whereever this is maintained if the
typo is still in the upstream version, otherwise our copy should maybe be updated

Thanks

[...]
Stephen Hutchinson Jan. 3, 2019, 6:22 a.m. UTC | #3
On 1/2/2019 4:43 PM, Michael Niedermayer wrote:
> On Wed, Jan 02, 2019 at 10:34:21AM -0900, Lou Logan wrote:
>> On Mon, Dec 31, 2018, at 12:03 PM, Michael Niedermayer wrote:
>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>> ---
>>>   doc/indevs.texi | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> Ok.  Same typo is in compat/avisynth/avisynth_c.h.
> yes, you should probably report this to avisynth or whereever this is maintained if the
> typo is still in the upstream version, otherwise our copy should maybe be updated
For statistics' sake, the commit introducing that text was from November 
2014¹, and it happened on the
original 2.6 CVS on Sourceforge (which no longer provides CVS, and 2.6 
hasn't migrated to SVN or Git
on Sourceforge; the inactivity is generally assumed to mean AviSynth+ 
should be treated as 'upstream').

AviSynth+ merged in those changes sometime later, and are still present 
in the current/de facto development
HEAD².  The version we ship in compat is slightly older than what 
AviSynth+ currently provides, due
to some issues with MSVC/GCC client program compatibility in the 
avs/capi.h header when [the
chronically fragile support for] GCC compilation of the main AviSynth+ 
project was added in 2016.

¹a mirror of the CVS version of the file from 2015: 
https://github.com/jeeb/avisynth/blame/master/src/core/avisynth_c.h
²https://github.com/pinterf/AviSynthPlus/blob/MT/avs_core/include/avisynth_c.h#L255

tl;dr: the header shipped in compat isn't really out of date with 
upstream in its essential functions,
so if the typo just gets fixed here it's probably not a big deal.
diff mbox

Patch

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 294ffa137c..af3173217f 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -374,7 +374,7 @@  Defaults to @option{false}.
 @item timestamp_align
 Capture start time alignment in seconds. If set to nonzero, input frames are
 dropped till the system timestamp aligns with configured value.
-Alignment difference of upto one frame duration is tolerated.
+Alignment difference of up to one frame duration is tolerated.
 This is useful for maintaining input synchronization across N different
 hardware devices deployed for 'N-way' redundancy. The system time of different
 hardware devices should be synchronized with protocols such as NTP or PTP,