diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:09:35 +0100 |
| commit | c4e394e46008c9e208f666d156f49f7ba500d73a (patch) | |
| tree | 4c70acf89ede1f9d24ec3056bb2d586f98a12bcd /libavcodec/dsputil.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/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f0158cdf2a..248446eb3a 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -147,7 +147,6 @@ void clear_blocks_c(int16_t *blocks); typedef void (*op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h); typedef void (*tpel_mc_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int w, int h); typedef void (*qpel_mc_func)(uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride); -typedef void (*h264_chroma_mc_func)(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int srcStride, int h, int x, int y); typedef void (*op_fill_func)(uint8_t *block/*align width (8 or 16)*/, uint8_t value, int line_size, int h); @@ -325,12 +324,6 @@ typedef struct DSPContext { qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16]; qpel_mc_func put_mspel_pixels_tab[8]; - /** - * h264 Chroma MC - */ - h264_chroma_mc_func put_h264_chroma_pixels_tab[3]; - h264_chroma_mc_func avg_h264_chroma_pixels_tab[3]; - me_cmp_func pix_abs[2][4]; /* huffyuv specific */ |