diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:20:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:25:27 +0100 |
| commit | 28245fb466d8deb401127e88f24aa82671936aee (patch) | |
| tree | 801f6dc18556ce5b7cb137a509bcce298103c3bf /libavcodec/dsputil.c | |
| parent | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (diff) | |
| parent | 0e02b381b4850bbc5b8e1ce6e17447968a2ae8b5 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index a075ea48a0..4b3db63707 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3053,8 +3053,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->clear_blocks = FUNCC(clear_blocks ## dct , depth);\ c->add_pixels8 = FUNCC(add_pixels8 ## dct , depth);\ c->add_pixels4 = FUNCC(add_pixels4 ## dct , depth);\ - c->put_no_rnd_pixels_l2[0] = FUNCC(put_no_rnd_pixels16_l2, depth);\ - c->put_no_rnd_pixels_l2[1] = FUNCC(put_no_rnd_pixels8_l2 , depth);\ + c->put_no_rnd_pixels_l2 = FUNCC(put_no_rnd_pixels8_l2 , depth);\ \ c->put_h264_chroma_pixels_tab[0] = FUNCC(put_h264_chroma_mc8 , depth);\ c->put_h264_chroma_pixels_tab[1] = FUNCC(put_h264_chroma_mc4 , depth);\ |