diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-06-21 03:58:57 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-06-21 03:58:57 +0000 |
| commit | 2a06f90f75f6e99af8b39d41e78dc6f6850fe68d (patch) | |
| tree | e215f9e2dbfef6eea251880179c3f73c6765f489 /src/libffmpeg/libavcodec/wmv2.c | |
| parent | 7ec65b9aeaded392195543631da79bcf912382ab (diff) | |
| download | xine-lib-2a06f90f75f6e99af8b39d41e78dc6f6850fe68d.tar.gz xine-lib-2a06f90f75f6e99af8b39d41e78dc6f6850fe68d.tar.bz2 | |
major purpose of this update is to import the rearranged MC edge
emulation facilities
CVS patchset: 5079
CVS date: 2003/06/21 03:58:57
Diffstat (limited to 'src/libffmpeg/libavcodec/wmv2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmv2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index ccac9fe77..ea4f407eb 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -650,7 +650,7 @@ void ff_mspel_motion(MpegEncContext *s, if(s->flags&CODEC_FLAG_EMU_EDGE){ if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos || src_y + h+1 >= v_edge_pos){ - ff_emulated_edge_mc(s, ptr - 1 - s->linesize, s->linesize, 19, 19, + ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19, src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos); ptr= s->edge_emu_buffer + 1 + s->linesize; emu=1; @@ -691,7 +691,7 @@ void ff_mspel_motion(MpegEncContext *s, offset = (src_y * uvlinesize) + src_x; ptr = ref_picture[1] + offset; if(emu){ - ff_emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9, + ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); ptr= s->edge_emu_buffer; } @@ -699,7 +699,7 @@ void ff_mspel_motion(MpegEncContext *s, ptr = ref_picture[2] + offset; if(emu){ - ff_emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9, + ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); ptr= s->edge_emu_buffer; } |