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/viterbi.txt | |
| 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/viterbi.txt')
| -rw-r--r-- | doc/viterbi.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |