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/vp56.c | |
| parent | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (diff) | |
| parent | 0e02b381b4850bbc5b8e1ce6e17447968a2ae8b5 (diff) | |
| download | ffmpeg-28245fb466d8deb401127e88f24aa82671936aee.tar.gz | |
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/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 581ba517bc..13bbb02481 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -373,9 +373,9 @@ static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, s->filter(s, dst, src_block, src_offset, src_offset+overlap_offset, stride, s->mv[b], mask, s->filter_selection, b<4); else - s->dsp.put_no_rnd_pixels_l2[1](dst, src_block+src_offset, - src_block+src_offset+overlap_offset, - stride, 8); + s->dsp.put_no_rnd_pixels_l2(dst, src_block+src_offset, + src_block+src_offset+overlap_offset, + stride, 8); } else { s->dsp.put_pixels_tab[1][0](dst, src_block+src_offset, stride, 8); } |