[SCM] libav/experimental: Fix alignment broke by my last patch
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:09:55 UTC 2013
The following commit has been merged in the experimental branch:
commit f87d2632b3495246abea6c49d8c66e61f71ae618
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Sat Dec 1 22:35:38 2007 +0000
Fix alignment broke by my last patch
Originally committed as revision 11123 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index fa21b1d..3871fc8 100644
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@@ -1094,7 +1094,7 @@ POWERPC_PERF_START_COUNT(altivec_hadamard8_diff8x8_num, 1);
dstV = \
(vector signed short)vec_mergeh((vector signed char)vzero, \
(vector signed char)dstO); \
- /* subtractions inside the first butterfly */ \
+ /* subtractions inside the first butterfly */ \
but0 = vec_sub(srcV, dstV); \
op1 = vec_perm(but0, but0, perm1); \
but1 = vec_mladd(but0, vprod1, op1); \
@@ -1267,7 +1267,7 @@ static int hadamard8_diff16x8_altivec(/*MpegEncContext*/ void *s, uint8_t *dst,
dstW = \
(vector signed short)vec_mergel((vector signed char)vzero, \
(vector signed char)dstO); \
- /* subtractions inside the first butterfly */ \
+ /* subtractions inside the first butterfly */ \
but0 = vec_sub(srcV, dstV); \
but0S = vec_sub(srcW, dstW); \
op1 = vec_perm(but0, but0, perm1); \
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index d8dc759..6c478d1 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -4102,7 +4102,7 @@ assert(s->current_picture.pict_type == s->pict_type);
}
/* 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;
av_free(buf2);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list