Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '4a606c830a'

Browse source 
* commit '4a606c830a':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
	Makefile
	libavutil/mem.c
	library.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-23 13:30:51 +01:00
commit 25ca8aef54
6 changed files with 122 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libavcodec/mpegvideo_motion.c
View file

@ -178,20 +178,19 @@ static inline int hpel_motion(MpegEncContext *s,
op_pixels_func *pix_op,
int motion_x, int motion_y)
{
int dxy;
int dxy = 0;
int emu=0;
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
src_x += motion_x >> 1;
src_y += motion_y >> 1;
/* WARNING: do no forget half pels */
src_x = av_clip(src_x, -16, s->width); //FIXME unneeded for emu?
if (src_x == s->width)
dxy &= ~1;
if (src_x != s->width)
dxy |= motion_x & 1;
src_y = av_clip(src_y, -16, s->height);
if (src_y == s->height)
dxy &= ~2;
if (src_y != s->height)
dxy |= (motion_y & 1) << 1;
src += src_y * s->linesize + src_x;
if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){