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/vp3.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/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 62416172de..98e8e729d8 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1564,7 +1564,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) motion_source, stride, 8); }else{ int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1 - s->dsp.put_no_rnd_pixels_l2[1]( + s->dsp.put_no_rnd_pixels_l2( output_plane + first_pixel, motion_source - d, motion_source + stride + 1 + d, |