diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
| commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
| tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /doc | |
| parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
| parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) | |
| download | ffmpeg-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.gz | |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Doxyfile | 2 | ||||
| -rw-r--r-- | doc/developer.texi | 2 | ||||
| -rw-r--r-- | doc/rate_distortion.txt | 2 | ||||
| -rw-r--r-- | doc/viterbi.txt | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/Doxyfile b/doc/Doxyfile index 9e12ab04af..7e6d0f56fd 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -288,7 +288,7 @@ TYPEDEF_HIDES_STRUCT = NO # causing a significant performance penality. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/doc/developer.texi b/doc/developer.texi index b0e5216ed4..e75f3b9403 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -170,7 +170,7 @@ For exported names, each library has its own prefixes. Just check the existing code and name accordingly. @end itemize -@subsection Miscellanous conventions +@subsection Miscellaneous conventions @itemize @bullet @item fprintf and printf are forbidden in libavformat and libavcodec, diff --git a/doc/rate_distortion.txt b/doc/rate_distortion.txt index a7d2c878b2..e9711c2d5c 100644 --- a/doc/rate_distortion.txt +++ b/doc/rate_distortion.txt @@ -23,7 +23,7 @@ Let's consider the problem of minimizing: rate is the filesize distortion is the quality -lambda is a fixed value choosen as a tradeoff between quality and filesize +lambda is a fixed value chosen as a tradeoff between quality and filesize Is this equivalent to finding the best quality for a given max filesize? The answer is yes. For each filesize limit there is some lambda factor for which minimizing above will get you the best quality (using your diff --git a/doc/viterbi.txt b/doc/viterbi.txt index 5362a0b765..97825462cc 100644 --- a/doc/viterbi.txt +++ b/doc/viterbi.txt @@ -85,8 +85,8 @@ here are some edges we could choose from: / \ O-----2--4--O -Finding the new best pathes and scores for each point of our new column is -trivial given we know the previous column best pathes and scores: +Finding the new best paths and scores for each point of our new column is +trivial given we know the previous column best paths and scores: O-----0-----8 \ |