diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:54:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 15:33:23 +0100 |
commit | 26345acb0e723d28aa28e09126ea383b2f679f5b (patch) | |
tree | f8d7a9f62d7557aca5ad56dd244fa415fdab56f2 /libavcodec/vp3.c | |
parent | 9774251c45eadfe0ba7b0381344451fa8840cc0d (diff) | |
parent | 0881cbf314982cce8448bd12644ce2a6e0b8c576 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
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 7b470dcccf..11436e5772 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1570,7 +1570,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( + s->vp3dsp.put_no_rnd_pixels_l2( output_plane + first_pixel, motion_source - d, motion_source + stride + 1 + d, |