diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 16:09:35 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 16:09:35 +0400 |
commit | c4e394e46008c9e208f666d156f49f7ba500d73a (patch) | |
tree | 4c70acf89ede1f9d24ec3056bb2d586f98a12bcd /libavcodec/vc1dsp.h | |
parent | b5884db437eebe136efef63a8186b7b4b51b5525 (diff) | |
parent | 79dad2a932534d1155079f937649e099f9e5cc27 (diff) |
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'
* commit '79dad2a932534d1155079f937649e099f9e5cc27':
dsputil: Separate h264chroma
Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
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 1d4c813528..6540eff0b8 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -29,6 +29,7 @@ #define AVCODEC_VC1DSP_H #include "dsputil.h" +#include "h264chroma.h" typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int h); |