diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:30:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:53:33 +0100 |
commit | 77bc34297596476c1644a497615038d18eed63fe (patch) | |
tree | 901172b5bb0d19d05710e6c144425173dcec9022 /libavcodec/pixels.h | |
parent | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (diff) | |
parent | 322a1dda973e802db7b57f2007fad3efcd5bab81 (diff) | |
download | ffmpeg-77bc34297596476c1644a497615038d18eed63fe.tar.gz |
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pixels.h')
-rw-r--r-- | libavcodec/pixels.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libavcodec/pixels.h b/libavcodec/pixels.h new file mode 100644 index 0000000000..98eacd4df6 --- /dev/null +++ b/libavcodec/pixels.h @@ -0,0 +1,37 @@ +/* + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_PIXELS_H +#define AVCODEC_PIXELS_H + +#include <stddef.h> +#include <stdint.h> + +/* pixel operations */ +#define CALL_2X_PIXELS_MACRO(STATIC, a, b, n) \ +STATIC void a(uint8_t *block, const uint8_t *pixels, \ + ptrdiff_t line_size, int h) \ +{ \ + b(block, pixels, line_size, h); \ + b(block + n, pixels + n, line_size, h); \ +} + +#define CALL_2X_PIXELS(a, b, n) CALL_2X_PIXELS_MACRO(static, a, b, n) +#define CALL_2X_PIXELS_EXPORT(a, b, n) CALL_2X_PIXELS_MACRO(, a, b, n) + +#endif /* AVCODEC_PIXELS_H */ |