diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 03:23:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 03:23:04 +0400 |
| commit | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (patch) | |
| tree | a72ecac476a799f37c63fe704758f61044a999e8 /libavcodec/dsputil.h | |
| parent | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (diff) | |
| parent | cb52a17cb62297802b0a77e5af9850d87c3f925b (diff) | |
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index e4998ecda1..f2198698f4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -136,7 +136,6 @@ typedef struct DSPContext { void (*add_pixels_clamped)(const int16_t *block /* align 16 */, uint8_t *pixels /* align 8 */, int line_size); - void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size); int (*sum_abs_dctelem)(int16_t *block /* align 16 */); /** * translational global motion compensation. |