Fix alignment broke by my last patch

Originally committed as revision 11123 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Vitor Sessak 17 years ago
parent 52b541ad79
commit f87d2632b3
  1. 4
      libavcodec/ppc/dsputil_altivec.c
  2. 2
      libavcodec/vc1.c

@ -1094,7 +1094,7 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff8x8_num, 1);
dstV = \ dstV = \
(vector signed short)vec_mergeh((vector signed char)vzero, \ (vector signed short)vec_mergeh((vector signed char)vzero, \
(vector signed char)dstO); \ (vector signed char)dstO); \
/* subtractions inside the first butterfly */ \ /* subtractions inside the first butterfly */ \
but0 = vec_sub(srcV, dstV); \ but0 = vec_sub(srcV, dstV); \
op1 = vec_perm(but0, but0, perm1); \ op1 = vec_perm(but0, but0, perm1); \
but1 = vec_mladd(but0, vprod1, op1); \ but1 = vec_mladd(but0, vprod1, op1); \
@ -1267,7 +1267,7 @@ static int hadamard8_diff16x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst,
dstW = \ dstW = \
(vector signed short)vec_mergel((vector signed char)vzero, \ (vector signed short)vec_mergel((vector signed char)vzero, \
(vector signed char)dstO); \ (vector signed char)dstO); \
/* subtractions inside the first butterfly */ \ /* subtractions inside the first butterfly */ \
but0 = vec_sub(srcV, dstV); \ but0 = vec_sub(srcV, dstV); \
but0S = vec_sub(srcW, dstW); \ but0S = vec_sub(srcW, dstW); \
op1 = vec_perm(but0, but0, perm1); \ op1 = vec_perm(but0, but0, perm1); \

@ -4102,7 +4102,7 @@ assert(s->current_picture.pict_type == s->pict_type);
} }
/* Return the Picture timestamp as the frame number */ /* Return the Picture timestamp as the frame number */
/* we subtract 1 because it is added on utils.c */ /* we subtract 1 because it is added on utils.c */
avctx->frame_number = s->picture_number - 1; avctx->frame_number = s->picture_number - 1;
av_free(buf2); av_free(buf2);

Loading…
Cancel
Save