diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
| commit | 0104570fb65bef9986a630e0188b3756295693a9 (patch) | |
| tree | d0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavcodec/x86 | |
| parent | 711c8ee71d719d6d89a523618f078bb17dbe1abf (diff) | |
| parent | a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (diff) | |
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/fpel_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c index 9d3f36b6c8..9884c7d93a 100644 --- a/libavcodec/x86/fpel_mmx.c +++ b/libavcodec/x86/fpel_mmx.c @@ -29,7 +29,7 @@ #if HAVE_MMX_INLINE -// in case more speed is needed - unroling would certainly help +// in case more speed is needed - unrolling would certainly help void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { |