diff options
Diffstat (limited to 'libavcodec/videodsp_template.c')
| -rw-r--r-- | libavcodec/videodsp_template.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c index 28b8c3286d..f4ff2ba646 100644 --- a/libavcodec/videodsp_template.c +++ b/libavcodec/videodsp_template.c @@ -1,42 +1,46 @@ /* - * Copyright (c) 2002-2004 Michael Niedermayer + * Copyright (c) 2002-2012 Michael Niedermayer * Copyright (C) 2012 Ronald S. Bultje * - * 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 */ #include <assert.h> #include "bit_depth_template.c" - -static void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, - ptrdiff_t buf_linesize, - ptrdiff_t src_linesize, - int block_w, int block_h, - int src_x, int src_y, int w, int h) +void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, + ptrdiff_t buf_linesize, + ptrdiff_t src_linesize, + int block_w, int block_h, + int src_x, int src_y, int w, int h) { int x, y; int start_y, start_x, end_y, end_x; + if (!w || !h) + return; + if (src_y >= h) { - src += (h - 1 - src_y) * src_linesize; + src -= src_y * src_linesize; + src += (h - 1) * src_linesize; src_y = h - 1; } else if (src_y <= -block_h) { - src += (1 - block_h - src_y) * src_linesize; + src -= src_y * src_linesize; + src += (1 - block_h) * src_linesize; src_y = 1 - block_h; } if (src_x >= w) { @@ -51,8 +55,8 @@ static void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, start_x = FFMAX(0, -src_x); end_y = FFMIN(block_h, h-src_y); end_x = FFMIN(block_w, w-src_x); - assert(start_y < end_y && block_h); - assert(start_x < end_x && block_w); + av_assert2(start_y < end_y && block_h); + av_assert2(start_x < end_x && block_w); w = end_x - start_x; src += start_y * src_linesize + start_x * sizeof(pixel); |