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 /libswscale | |
| parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
| parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) | |
| download | ffmpeg-streaming-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.zip ffmpeg-streaming-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 'libswscale')
| -rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 2 | ||||
| -rw-r--r-- | libswscale/swscale.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 60d50a7..792deb9 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -1,5 +1,5 @@ /* - * AltiVec-enhanced yuv-to-yuv convertion routines. + * AltiVec-enhanced yuv-to-yuv conversion routines. * * Copyright (C) 2004 Romain Dolbeau <romain@dolbeau.org> * based on the equivalent C code in swscale.c diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a422960..ec42440 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -148,7 +148,7 @@ static void hScale8To19_c(SwsContext *c, int16_t *_dst, int dstW, } } -// FIXME all pal and rgb srcFormats could do this convertion as well +// FIXME all pal and rgb srcFormats could do this conversion as well // FIXME all scalers more complex than bilinear could do half of this transform static void chrRangeToJpeg_c(int16_t *dstU, int16_t *dstV, int width) { |
