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 /libavcodec/indeo3data.h | |
| 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 'libavcodec/indeo3data.h')
| -rw-r--r-- | libavcodec/indeo3data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h index 0b5648eb20..e7e28a3b45 100644 --- a/libavcodec/indeo3data.h +++ b/libavcodec/indeo3data.h @@ -235,7 +235,7 @@ /** * Pack two delta values (a,b) into one 16bit word - * according with endianess of the host machine. + * according with endianness of the host machine. */ #if HAVE_BIGENDIAN #define PD(a,b) (((a) << 8) + (b)) @@ -282,7 +282,7 @@ static const int16_t delta_tab_3_5[79] = { TAB_3_5 }; /** * Pack four delta values (a,a,b,b) into one 32bit word - * according with endianess of the host machine. + * according with endianness of the host machine. */ #if HAVE_BIGENDIAN #define PD(a,b) (((a) << 24) + ((a) << 16) + ((b) << 8) + (b)) |