diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffserver.texi | 2 | ||||
| -rw-r--r-- | doc/swresample.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 9a09005343..f6cbfa774e 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -221,7 +221,7 @@ of an infinite movie or a whole movie. FFM is version specific, and there is limited compatibility of FFM files generated by one version of ffmpeg/ffserver and another version of -ffmpeg/ffserver. It may work but its not guaranteed to work. +ffmpeg/ffserver. It may work but it is not guaranteed to work. FFM2 is extensible while maintaining compatibility and should work between differing versions of tools. FFM2 is the default. diff --git a/doc/swresample.txt b/doc/swresample.txt index 790414793e..2d192a394e 100644 --- a/doc/swresample.txt +++ b/doc/swresample.txt @@ -32,9 +32,9 @@ Special Converter v Output Planar/Packed conversion is done when needed during sample format conversion. -Every step can be skipped without memcpy when its not needed. +Every step can be skipped without memcpy when it is not needed. Either Resampling and Rematrixing can be performed first depending on which -way its faster. +way it is faster. The Buffers are needed for resampling due to resamplng being a process that requires future and past data, it thus also introduces inevitably a delay when used. |