r750 - in /experimental/ffmpeg/debian: patches/020_fix_libswscale_pic_code rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu Apr 12 07:50:32 2007
New Revision: 750

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=750
Log:
fixup my previous botched commit

Added:
    experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code
Modified:
    experimental/ffmpeg/debian/rules

Added: experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code?rev=750&op=file
==============================================================================
--- experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code (added)
+++ experimental/ffmpeg/debian/patches/020_fix_libswscale_pic_code Thu Apr 12 07:50:32 2007
@@ -1,0 +1,22 @@
+Index: ffmpeg.feisty/libswscale/swscale.c
+===================================================================
+--- ffmpeg.feisty.orig/libswscale/swscale.c	2007-03-16 17:40:54.000000000 +0100
++++ ffmpeg.feisty/libswscale/swscale.c	2007-03-16 17:58:05.000000000 +0100
+@@ -1289,7 +1289,7 @@
+         return 0;
+ }
+ 
+-#ifdef COMPILE_MMX2
++#if defined (COMPILE_MMX2) && !defined(ARCH_X86_64)
+ static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *filter, int32_t *filterPos, int numSplits)
+ {
+ 	uint8_t *fragmentA;
+@@ -2200,7 +2200,7 @@
+ 				 srcFilter->chrH, dstFilter->chrH, c->param);
+ 
+ #define MAX_FUNNY_CODE_SIZE 10000
+-#if defined(COMPILE_MMX2)
++#if defined (COMPILE_MMX2) && !defined(ARCH_X86_64)
+ // can't downscale !!!
+ 		if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
+ 		{

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=750&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Thu Apr 12 07:50:32 2007
@@ -107,7 +107,7 @@
 	cp libpostproc/libpostproc.a debian/tmp/usr/lib
 	cp libpostproc/postprocess.h debian/tmp/usr/include/postproc
 	cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/
-	for d in $(LIBS); do cp $$d/$$d.so* debian/tmp/usr/lib; done
+	for d in $(LIBS); do cp $$d/$$d.so* tmp/usr/lib; done
 	cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
 	cp doc/ffserver.conf debian/tmp/etc/