aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-29 00:07:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-29 00:09:08 +0200
commit68c3e6025fa03801519d95227da3a7b04ae1c012 (patch)
tree6bb91f37f8efd95f132380a1bcefb06974aa8213 /libswresample
parent812066835189b9bf8c71d4178019949da4171259 (diff)
downloadffmpeg-68c3e6025fa03801519d95227da3a7b04ae1c012.tar.gz
Fix convertion typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index 4ba008e728..0525289eb0 100644
--- a/libswresample/swresample.h
+++ b/libswresample/swresample.h
@@ -210,7 +210,7 @@ void swr_free(struct SwrContext **s);
*
* If more input is provided than output space then the input will be buffered.
* You can avoid this buffering by providing more output space than input.
- * Convertion will run directly without copying whenever possible.
+ * Conversion will run directly without copying whenever possible.
*
* @param s allocated Swr context, with parameters set
* @param out output buffers, only the first one need be set in case of packed audio