diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:36:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:36:23 +0200 |
| commit | d2d2c309e8f3bbe24d9592aec87c5875473f623b (patch) | |
| tree | 63cb3ae6b3073b8a29cd8b96bbaef86a85c6f3b2 /libavcodec/vc1dsp.h | |
| parent | 6ec26157b96b74a26c5148bffbf862920a1afc34 (diff) | |
| parent | 54cd5e4f92de6bd0fb8e24069153b0156c8136bc (diff) | |
| download | ffmpeg-d2d2c309e8f3bbe24d9592aec87c5875473f623b.tar.gz | |
Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'
* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
dsputil: Remove hpel functions (moved to hpeldsp)
Conflicts:
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dsp.h')
| -rw-r--r-- | libavcodec/vc1dsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h index 851e40c735..5e332a0e4f 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -29,6 +29,7 @@ #define AVCODEC_VC1DSP_H #include "dsputil.h" +#include "hpeldsp.h" #include "h264chroma.h" typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h); |