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/vp6.c | |
| parent | b5884db437eebe136efef63a8186b7b4b51b5525 (diff) | |
| parent | 79dad2a932534d1155079f937649e099f9e5cc27 (diff) | |
| download | ffmpeg-c4e394e46008c9e208f666d156f49f7ba500d73a.tar.gz | |
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/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index c6ca13c5c0..04afdf8236 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -536,8 +536,8 @@ static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src, int stride, int h_weight, int v_weight) { uint8_t *tmp = s->edge_emu_buffer+16; - s->dsp.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0); - s->dsp.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight); + s->h264chroma.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0); + s->h264chroma.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight); } static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src, @@ -583,7 +583,7 @@ static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src, } } else { if (!x8 || !y8) { - s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8); + s->h264chroma.put_h264_chroma_pixels_tab[0](dst, src + offset1, stride, 8, x8, y8); } else { vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8, y8); } |