diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:07:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:09:08 +0200 |
| commit | 68c3e6025fa03801519d95227da3a7b04ae1c012 (patch) | |
| tree | 6bb91f37f8efd95f132380a1bcefb06974aa8213 | |
| parent | 812066835189b9bf8c71d4178019949da4171259 (diff) | |
| download | ffmpeg-68c3e6025fa03801519d95227da3a7b04ae1c012.tar.gz | |
Fix convertion typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/v4l2.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index c671e3ac73..4b3f6a8c73 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -1014,7 +1014,7 @@ static const AVOption options[] = { { "default", "use timestamps from the kernel", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_DEFAULT }, 0, 2, DEC, "timestamps" }, { "abs", "use absolute timestamps (wall clock)", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_ABS }, 0, 2, DEC, "timestamps" }, { "mono2abs", "force conversion from monotonic to absolute timestamps", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_MONO2ABS }, 0, 2, DEC, "timestamps" }, - { "use_libv4l2", "use libv4l2 (v4l-utils) convertion functions", OFFSET(use_libv4l2), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC }, + { "use_libv4l2", "use libv4l2 (v4l-utils) conversion functions", OFFSET(use_libv4l2), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC }, { NULL }, }; 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 |