avcodec: fix unaligned USWC copy (fixes #6333)

39dc439c · Rémi Denis-Courmont · 44819779 · 39dc439c
Commit 39dc439c authored Oct 11, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

modules/codec/avcodec/copy.c modules/codec/avcodec/copy.c +3 -3

No files found.
--- a/modules/codec/avcodec/copy.c
+++ b/modules/codec/avcodec/copy.c
@@ -86,10 +86,10 @@ static void CopyFromUswc(uint8_t *dst, size_t dst_pitch,

    ASM_SSE2(cpu, "mfence");
    for (unsigned y = 0; y < height; y++) {
-        const unsigned unaligned = (intptr_t)src & 0x0f;
-        unsigned x;
+        const unsigned unaligned = (-(uintptr_t)src) & 0x0f;
+        unsigned x = 0;

-        for (x = 0; x < unaligned; x++)
+        for (; x < unaligned; x++)
            dst[x] = src[x];

 #ifdef CAN_COMPILE_SSE4_1