diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:30:20 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 01:53:33 +0400 |
| commit | 77bc34297596476c1644a497615038d18eed63fe (patch) | |
| tree | 901172b5bb0d19d05710e6c144425173dcec9022 /libavcodec/dsputil.h | |
| parent | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (diff) | |
| parent | 322a1dda973e802db7b57f2007fad3efcd5bab81 (diff) | |
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/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 8f83006006..5255625737 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -31,7 +31,6 @@ #define AVCODEC_DSPUTIL_H #include "avcodec.h" -#include "rnd_avg.h" /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; @@ -40,7 +39,6 @@ extern const uint8_t ff_zigzag248_direct[64]; extern uint32_t ff_square_tab[512]; -/* pixel operations */ void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); |