RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()

Browse Source 
This is in line with the other functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-24 17:14:21 +02:00
parent 2599a62fbb
commit dcc7686ae7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mpegvideo.c
View File

@ -2387,14 +2387,12 @@ static inline void chroma_4mv_motion_lowres(MpegEncContext *s,
offset = src_y * s->uvlinesize + src_x; offset = src_y * s->uvlinesize + src_x;
ptr = ref_picture[1] + offset; ptr = ref_picture[1] + offset;
if (s->flags & CODEC_FLAG_EMU_EDGE) { if ((unsigned) src_x > FFMAX(h_edge_pos - (!!sx) - block_s, 0) ||
if ((unsigned) src_x > FFMAX(h_edge_pos - (!!sx) - block_s, 0) || (unsigned) src_y > FFMAX(v_edge_pos - (!!sy) - block_s, 0)) {
(unsigned) src_y > FFMAX(v_edge_pos - (!!sy) - block_s, 0)) { s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize,
s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
9, 9, src_x, src_y, h_edge_pos, v_edge_pos); ptr = s->edge_emu_buffer;
ptr = s->edge_emu_buffer; emu = 1;
emu = 1;
}
} }
sx = (sx << 2) >> lowres; sx = (sx << 2) >> lowres;
sy = (sy << 2) >> lowres; sy = (sy << 2) >> lowres;