diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
| commit | af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (patch) | |
| tree | f093e566a4985317a2dc7d9f3f5df38599142720 /libavcodec/sh4 | |
| parent | 80a9297b711b7acb152ebbf84b28772945f920ea (diff) | |
| parent | 523c7bd23c781aa0f3a85044896f5e18e8b52534 (diff) | |
| download | ffmpeg-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.tar.gz | |
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
| -rw-r--r-- | libavcodec/sh4/dsputil_align.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 31f8bdfb2f..88a86ac875 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -38,7 +38,7 @@ #define rnd_PACK(ph,pl,nph,npl) ph + nph + (((pl + npl + BYTE_VEC32(0x02))>>2) & BYTE_VEC32(0x03)) #define no_rnd_PACK(ph,pl,nph,npl) ph + nph + (((pl + npl + BYTE_VEC32(0x01))>>2) & BYTE_VEC32(0x03)) -/* little endian */ +/* little-endian */ #define MERGE1(a,b,ofs) (ofs==0)?a:( ((a)>>(8*ofs))|((b)<<(32-8*ofs)) ) #define MERGE2(a,b,ofs) (ofs==3)?b:( ((a)>>(8*(ofs+1)))|((b)<<(32-8*(ofs+1))) ) /* big |