diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:40:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:42:07 +0200 |
| commit | 23de9e91df1c855a89a468ee7cf203dcf0bab41f (patch) | |
| tree | 19b8bf9f44dd79385270e7f43a92b1c81207f607 /libavcodec/hpeldsp.c | |
| parent | 6c9d28a2294de86519c7c613c76394c66dcfd83c (diff) | |
| parent | 68d8238cca52e50e8cc81bf2edcaf8088c52d4c0 (diff) | |
| download | ffmpeg-23de9e91df1c855a89a468ee7cf203dcf0bab41f.tar.gz | |
Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
* commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0':
hpeldsp: Add half-pel functions (currently copies of dsputil)
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.c')
| -rw-r--r-- | libavcodec/hpeldsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c index a9139bf9c3..bcc7b45d1b 100644 --- a/libavcodec/hpeldsp.c +++ b/libavcodec/hpeldsp.c @@ -28,12 +28,13 @@ */ #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "hpeldsp.h" #define BIT_DEPTH 8 #include "hpeldsp_template.c" -av_cold void ff_hpeldsp_init(HpelDSPContext* c, int flags) +av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags) { #define hpel_funcs(prefix, idx, num) \ c->prefix ## _pixels_tab idx [0] = prefix ## _pixels ## num ## _8_c; \ |