diff options
Diffstat (limited to 'libavcodec/hpeldsp.h')
-rw-r--r-- | libavcodec/hpeldsp.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index 68190ad8c3..8e68729d8a 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -3,20 +3,20 @@ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * - * 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 */ @@ -38,6 +38,9 @@ typedef void (*hpel_pixels_func)(uint8_t *block /*align width (8 or 16)*/, const uint8_t *pixels /*align 1*/, ptrdiff_t line_size, int h); +typedef void (*op_pixels_func)(uint8_t *block /*align width (8 or 16)*/, + const uint8_t *pixels /*align 1*/, + ptrdiff_t line_size, int h); /** * Half-pel DSP context. @@ -69,7 +72,7 @@ typedef struct HpelDSPContext { /** * Halfpel motion compensation with no rounding (a+b)>>1. - * this is an array[2][4] of motion compensation functions for 2 + * this is an array[4][4] of motion compensation functions for 2 * horizontal blocksizes (8,16) and the 4 halfpel positions<br> * *pixels_tab[ 0->16xH 1->8xH ][ xhalfpel + 2*yhalfpel ] * @param block destination where the result is stored @@ -77,7 +80,7 @@ typedef struct HpelDSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - hpel_pixels_func put_no_rnd_pixels_tab[2][4]; + hpel_pixels_func put_no_rnd_pixels_tab[4][4]; /** * Halfpel motion compensation with no rounding (a+b)>>1. |