diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
| commit | 5c6e94c42bcdc026071855a6b1749406b2456c8b (patch) | |
| tree | e8ce939224cce418e2069a83f41ad706c3fcd94a /libavcodec/wmv2.c | |
| parent | a9a312d299c785b4b4655ab70753aa5a2a933aae (diff) | |
| parent | 256da0770e495176d1b2699ec6e9c7993c2a6d7b (diff) | |
| download | ffmpeg-streaming-5c6e94c42bcdc026071855a6b1749406b2456c8b.zip ffmpeg-streaming-5c6e94c42bcdc026071855a6b1749406b2456c8b.tar.gz | |
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
dsputil: Move mspel_pixels_tab to the only place it is used
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index b8df6ca..2295ed2 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -129,10 +129,10 @@ void ff_mspel_motion(MpegEncContext *s, emu=1; } - s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize); - s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize); - s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize); - s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize); + w->wdsp.put_mspel_pixels_tab[dxy](dest_y, ptr, linesize); + w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8, ptr + 8, linesize); + w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 * linesize, ptr + 8 * linesize, linesize); + w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 + 8 * linesize, ptr + 8 + 8 * linesize, linesize); if(s->flags&CODEC_FLAG_GRAY) return; |
