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/sh4/dsputil_align.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/sh4/dsputil_align.c')
| -rw-r--r-- | libavcodec/sh4/dsputil_align.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 736942512d..d59a12ec56 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -369,14 +369,6 @@ av_cold void ff_dsputil_init_align(DSPContext *c, AVCodecContext *avctx) /* dspfunc(avg_no_rnd_qpel, 1, 8); */ #undef dspfunc - if (!high_bit_depth) { - c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_sh4; - c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_sh4; - c->put_h264_chroma_pixels_tab[2]= put_h264_chroma_mc2_sh4; - c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_sh4; - c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_sh4; - c->avg_h264_chroma_pixels_tab[2]= avg_h264_chroma_mc2_sh4; - } c->put_mspel_pixels_tab[0]= put_mspel8_mc00_sh4; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_sh4; |