summaryrefslogtreecommitdiff
path: root/doc/developer.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
commitd27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch)
treeb43acbce10229c375ac3b21c80a6c2c09354da8d /doc/developer.texi
parenta41bf09d9c56215448f14fb086c9f882eb41ecac (diff)
parent511cf612ac979f536fd65e14603a87ca5ad435f3 (diff)
downloadffmpeg-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/developer.texi')
-rw-r--r--doc/developer.texi2
1 files changed, 1 insertions, 1 deletions
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,