Changeset 809 for branches

Timestamp:

02/15/08 14:33:05 (5 months ago)

Author:

astrange

Message:

ffmpeg doesn't check for altivec presence before setting h263 idcts; fix this. closes #314

Files:

• branches/perian-1.1/ffmpeg-patch (modified) (7 diffs)

branches/perian-1.1/ffmpeg-patch

@@ -1 @@
-
-1-20 15:05:32
-1-20 17:09:12
+N
+2-15 15:13:00
+2-15 15:15:51
-@@ -1440,6 +1440,7 @@
-     \
@@ -92 +92 @@
- 
- #define op_avg(a, b) a = (((a)+(((b) + 32)>>6)+1)>>1)
-
-1-20 15:05:31
-1-20 17:08:3
+N
+2-15 15:12:38
+2-15 15:15:5
-@@ -182,14 +182,26 @@
-     }
@@ -133 +133 @@
- }
- 
-
-1-20 15:05:31
-1-20 17:03:15
+N
+2-15 15:12:38
+2-15 15:15:51
-@@ -1918,7 +1918,7 @@
- 
@@ -386 +386 @@
-          "r"(data+n2), "r"(data+len-2-n2)\
-     );
-
-1-20 15:05:31
-1-20 17:03:15
+N
+2-15 15:12:38
+2-15 15:15:51
-@@ -341,21 +341,21 @@
- // in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask)
@@ -448 +448 @@
- }
- 
-
-1-20 15:05:31
-1-20 17:03:15
+N
+2-15 15:12:38
+2-15 15:15:51
-@@ -167,7 +167,7 @@
- static inline void sad8_4_mmx2(uint8_t *blk1, uint8_t *blk2, int stride, int h)
@@ -487 +487 @@
- }
- 
-
-1-20 15:05:31
-1-20 17:03:15
+N
+2-15 15:12:38
+2-15 15:15:51
-@@ -363,7 +363,7 @@
-         "movq " #src4 ", %%mm1          \n\t" /* R6     R2      r6      r2 */\
@@ -535 +535 @@
-         );
- }
+diff -ruN ffmpeg/libavcodec/ppc/mpegvideo_altivec.c ffmpeg-/libavcodec/ppc/mpegvideo_altivec.c
+--- ffmpeg/libavcodec/ppc/mpegvideo_altivec.c   2008-02-15 15:12:50.000000000 -0500
++++ ffmpeg-/libavcodec/ppc/mpegvideo_altivec.c  2008-02-15 15:16:25.000000000 -0500
+@@ -610,7 +610,7 @@
+ {
+     if (s->avctx->lowres==0)
+     {
+-        if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
++        if ((mm_flags & MM_ALTIVEC && s->avctx->idct_algo == FF_IDCT_AUTO) ||
+                 (s->avctx->idct_algo == FF_IDCT_ALTIVEC))
+         {
+             s->dsp.idct_put = idct_put_altivec;
+@@ -636,7 +636,7 @@
+     }
+ 
+ 
+-    if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
++    if ((mm_flags & MM_ALTIVEC && s->avctx->dct_algo == FF_DCT_AUTO) ||
+             (s->avctx->dct_algo == FF_DCT_ALTIVEC))
+     {
+ #if 0 /* seems to cause trouble under some circumstances */