r213 - feisty/ffmpeg/debian/patches

[siretart at alioth.debian.org]

Author: siretart
Date: 2007-03-16 17:29:54 +0000 (Fri, 16 Mar 2007)
New Revision: 213

Added:
   feisty/ffmpeg/debian/patches/020_fix_libswscale_pic_code
   feisty/ffmpeg/debian/patches/020_fix_x264_and_dts_linkage
Modified:
   feisty/ffmpeg/debian/patches/series
Log:
add two new patches: 020_fix_x264_and_dts_linkage 020_fix_libswscale_pic_code

Added: feisty/ffmpeg/debian/patches/020_fix_libswscale_pic_code
===================================================================
--- feisty/ffmpeg/debian/patches/020_fix_libswscale_pic_code	2007-03-16 17:29:26 UTC (rev 212)
+++ feisty/ffmpeg/debian/patches/020_fix_libswscale_pic_code	2007-03-16 17:29:54 UTC (rev 213)
@@ -0,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))
+ 		{

Added: feisty/ffmpeg/debian/patches/020_fix_x264_and_dts_linkage
===================================================================
--- feisty/ffmpeg/debian/patches/020_fix_x264_and_dts_linkage	2007-03-16 17:29:26 UTC (rev 212)
+++ feisty/ffmpeg/debian/patches/020_fix_x264_and_dts_linkage	2007-03-16 17:29:54 UTC (rev 213)
@@ -0,0 +1,22 @@
+Index: ffmpeg.feisty/configure
+===================================================================
+--- ffmpeg.feisty.orig/configure	2007-03-16 17:59:56.000000000 +0100
++++ ffmpeg.feisty/configure	2007-03-16 18:01:19.000000000 +0100
+@@ -1555,7 +1555,7 @@
+ 
+ # these are off by default, so fail if requested and not available
+ enabled liba52     && require liba52 a52dec/a52.h a52_init -la52
+-enabled libdts     && require libdts dts.h dts_init -ldts -lm
++enabled libdts     && require libdts dts.h dts_init -ldts_pic -lm
+ enabled libgsm     && require libgsm gsm.h gsm_create -lgsm
+ enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
+ enabled libtheora  && require libtheora theora/theora.h theora_info_init -ltheora -logg
+@@ -1563,7 +1563,7 @@
+ enabled libogg     && require libogg ogg/ogg.h ogg_sync_init -logg
+ enabled libnut     && require libnut libnut.h nut_demuxer_init -lnut
+ enabled xvid       && require XviD xvid.h xvid_global -lxvidcore
+-enabled x264       && require x264 x264.h x264_encoder_open -lx264
++enabled x264       && require x264 x264.h x264_encoder_open -lx264_pic
+ enabled dc1394     && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
+ enabled mlib       && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
+ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac

Modified: feisty/ffmpeg/debian/patches/series
===================================================================
--- feisty/ffmpeg/debian/patches/series	2007-03-16 17:29:26 UTC (rev 212)
+++ feisty/ffmpeg/debian/patches/series	2007-03-16 17:29:54 UTC (rev 213)
@@ -8,9 +8,11 @@
 #020_mmx_intrinsics.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
+020_fix_libswscale_pic_code
 020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff
+020_fix_x264_and_dts_linkage
 040_early_altivec_detection.diff
 040_only_use_maltivec_when_needed.diff
 060_fix_avi_skip.diff