diff options
Diffstat (limited to 'libavcodec/huffyuvencdsp.c')
| -rw-r--r-- | libavcodec/huffyuvencdsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index 6c30877..95fcc19 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,12 +25,12 @@ #define pb_7f (~0UL / 255 * 0x7f) #define pb_80 (~0UL / 255 * 0x80) -static void diff_bytes_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) +static void diff_bytes_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w) { long i; #if !HAVE_FAST_UNALIGNED - if ((long) src2 & (sizeof(long) - 1)) { + if (((long)src1 | (long)src2) & (sizeof(long) - 1)) { for (i = 0; i + 7 < w; i += 8) { dst[i + 0] = src1[i + 0] - src2[i + 0]; dst[i + 1] = src1[i + 1] - src2[i + 1]; |
