diff --git a/.gitignore b/.gitignore index b0ecb1f..a6cc96d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ffmpeg-20080908.tar.bz2 +ffmpeg-20081202.tar.bz2 diff --git a/ffmpeg-asmreg.patch b/ffmpeg-asmreg.patch deleted file mode 100644 index 1e50aee..0000000 --- a/ffmpeg-asmreg.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up ffmpeg-20080614/libavcodec/Makefile.asmreg ffmpeg-20080614/libavcodec/Makefile ---- ffmpeg-20080614/libavcodec/Makefile.asmreg 2008-06-08 23:08:57.000000000 +0200 -+++ ffmpeg-20080614/libavcodec/Makefile 2008-06-14 17:24:58.000000000 +0200 -@@ -87,6 +87,11 @@ OBJS-$(CONFIG_H263I_DECODER) + - OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o - OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o - OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o golomb.o mpegvideo.o error_resilience.o -+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' -+# on ix86 in cabac.h -+ifeq ($(ARCH_X86_32),yes) -+h264.o: CFLAGS += -fomit-frame-pointer -+endif - OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o - OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o - OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o -@@ -391,6 +396,11 @@ OBJS-$(CONFIG_ENCODERS) + - OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o - OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o - OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o -+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' -+# on ix86 in snowdsp_mmx.c -+ifeq ($(ARCH_X86_32),yes) -+i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer -+endif - OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o - OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o - OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o diff --git a/ffmpeg-cmov.patch b/ffmpeg-cmov.patch deleted file mode 100644 index bb3300a..0000000 --- a/ffmpeg-cmov.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ffmpeg-20080908/configure.cmov ffmpeg-20080908/configure ---- ffmpeg-20080908/configure.cmov 2008-11-01 16:23:33.000000000 +0100 -+++ ffmpeg-20080908/configure 2008-11-01 16:23:33.000000000 +0100 -@@ -1148,6 +1148,8 @@ case "$arch" in - ;; - x86_64|amd64) - arch="x86_32" -+ enable cmov -+ enable fast_cmov - enable fast_unaligned - check_cc <imdct_half = ff_imdct_half_c; - s->exptab1 = NULL; - --#if defined HAVE_MMX && defined HAVE_YASM -+#if (defined HAVE_MMX || defined HAVE_SSE || defined HAVE_AMD3DNOW) && defined HAVE_YASM - has_vectors = mm_support(); - if (has_vectors & MM_SSE) { -+#ifdef HAVE_SSE - /* SSE for P3/P4/K8 */ - s->imdct_calc = ff_imdct_calc_sse; - s->imdct_half = ff_imdct_half_sse; - s->fft_permute = ff_fft_permute_sse; - s->fft_calc = ff_fft_calc_sse; -+#endif - } else if (has_vectors & MM_3DNOWEXT) { -+#ifdef HAVE_AMD3DNOWEX - /* 3DNowEx for K7 */ - s->imdct_calc = ff_imdct_calc_3dn2; - s->imdct_half = ff_imdct_half_3dn2; - s->fft_calc = ff_fft_calc_3dn2; -+#endif - } else if (has_vectors & MM_3DNOW) { -+#ifdef HAVE_AMD3DNOW - /* 3DNow! for K6-2/3 */ - s->imdct_calc = ff_imdct_calc_3dn; - s->imdct_half = ff_imdct_half_3dn; - s->fft_calc = ff_fft_calc_3dn; -+#endif - } - #elif defined HAVE_ALTIVEC && !defined ALTIVEC_USE_REFERENCE_C_CODE - has_vectors = mm_support(); -diff -up ffmpeg-20080908/libavcodec/Makefile.cpu ffmpeg-20080908/libavcodec/Makefile ---- ffmpeg-20080908/libavcodec/Makefile.cpu 2008-09-02 06:04:26.000000000 +0200 -+++ ffmpeg-20080908/libavcodec/Makefile 2008-11-01 16:23:33.000000000 +0100 -@@ -383,6 +388,12 @@ OBJS += imgresample.o - endif - - # processor-specific code -+ifdef HAVE_AMD3DNOW -+OBJS-$(HAVE_YASM) += i386/fft_3dn.o -+endif -+ifdef HAVE_AMD3DNOWEX -+OBJS-$(HAVE_YASM) += i386/fft_3dn2.o -+endif - ifdef HAVE_MMX - OBJS += i386/fdct_mmx.o \ - i386/cpuid.o \ -@@ -391,12 +402,8 @@ OBJS += i386/fdct_mmx.o \ - i386/motion_est_mmx.o \ - i386/simple_idct_mmx.o \ - i386/idct_mmx_xvid.o \ -- i386/idct_sse2_xvid.o \ - - OBJS-$(HAVE_YASM) += i386/fft_mmx.o \ -- i386/fft_sse.o \ -- i386/fft_3dn.o \ -- i386/fft_3dn2.o \ - i386/dsputil_yasm.o \ - - OBJS-$(CONFIG_GPL) += i386/idct_mmx.o -@@ -414,6 +426,12 @@ OBJS-$(CONFIG_VP6A_DECODER) + - OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o - OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o - endif -+ifdef HAVE_SSE -+OBJS-$(HAVE_YASM) += i386/fft_sse.o -+endif -+ifdef HAVE_SSE2 -+OBJS += i386/idct_sse2_xvid.o -+endif - - ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ - armv4l/simple_idct_arm.o \ -diff -up ffmpeg-20080908/libpostproc/postprocess.c.cpu ffmpeg-20080908/libpostproc/postprocess.c ---- ffmpeg-20080908/libpostproc/postprocess.c.cpu 2008-09-01 20:00:53.000000000 +0200 -+++ ffmpeg-20080908/libpostproc/postprocess.c 2008-11-01 16:23:33.000000000 +0100 -@@ -83,7 +83,7 @@ try to unroll inner for(x=0 ... loop to - #include - #endif - //#undef HAVE_MMX2 --//#define HAVE_3DNOW -+//#define HAVE_AMD3DNOW - //#undef HAVE_MMX - //#undef ARCH_X86 - //#define DEBUG_BRIGHTNESS -@@ -567,7 +567,7 @@ static av_always_inline void do_a_debloc - - #if defined(ARCH_X86) - --#if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) -+#if (defined (HAVE_MMX) && !defined (HAVE_AMD3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) - #define COMPILE_MMX - #endif - -@@ -575,20 +575,20 @@ static av_always_inline void do_a_debloc - #define COMPILE_MMX2 - #endif - --#if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) -+#if (defined (HAVE_AMD3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) - #define COMPILE_3DNOW - #endif - #endif /* defined(ARCH_X86) */ - - #undef HAVE_MMX - #undef HAVE_MMX2 --#undef HAVE_3DNOW -+#undef HAVE_AMD3DNOW - #undef HAVE_ALTIVEC - - #ifdef COMPILE_C - #undef HAVE_MMX - #undef HAVE_MMX2 --#undef HAVE_3DNOW -+#undef HAVE_AMD3DNOW - #define RENAME(a) a ## _C - #include "postprocess_template.c" - #endif -@@ -606,7 +606,7 @@ static av_always_inline void do_a_debloc - #undef RENAME - #define HAVE_MMX - #undef HAVE_MMX2 --#undef HAVE_3DNOW -+#undef HAVE_AMD3DNOW - #define RENAME(a) a ## _MMX - #include "postprocess_template.c" - #endif -@@ -616,7 +616,7 @@ static av_always_inline void do_a_debloc - #undef RENAME - #define HAVE_MMX - #define HAVE_MMX2 --#undef HAVE_3DNOW -+#undef HAVE_AMD3DNOW - #define RENAME(a) a ## _MMX2 - #include "postprocess_template.c" - #endif -@@ -626,7 +626,7 @@ static av_always_inline void do_a_debloc - #undef RENAME - #define HAVE_MMX - #undef HAVE_MMX2 --#define HAVE_3DNOW -+#define HAVE_AMD3DNOW - #define RENAME(a) a ## _3DNow - #include "postprocess_template.c" - #endif -@@ -665,7 +665,7 @@ static inline void postProcess(const uin - #else //RUNTIME_CPUDETECT - #ifdef HAVE_MMX2 - postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); --#elif defined (HAVE_3DNOW) -+#elif defined (HAVE_AMD3DNOW) - postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); - #elif defined (HAVE_MMX) - postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); -diff -up ffmpeg-20080908/libpostproc/postprocess_template.c.cpu ffmpeg-20080908/libpostproc/postprocess_template.c ---- ffmpeg-20080908/libpostproc/postprocess_template.c.cpu 2008-05-09 13:56:36.000000000 +0200 -+++ ffmpeg-20080908/libpostproc/postprocess_template.c 2008-11-01 16:23:33.000000000 +0100 -@@ -33,7 +33,7 @@ - - #ifdef HAVE_MMX2 - #define REAL_PAVGB(a,b) "pavgb " #a ", " #b " \n\t" --#elif defined (HAVE_3DNOW) -+#elif defined (HAVE_AMD3DNOW) - #define REAL_PAVGB(a,b) "pavgusb " #a ", " #b " \n\t" - #endif - #define PAVGB(a,b) REAL_PAVGB(a,b) -@@ -179,7 +179,7 @@ static inline int RENAME(vertClassify)(u - #ifndef HAVE_ALTIVEC - static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*3; - asm volatile( //"movv %0 %1 %2\n\t" - "movq %2, %%mm0 \n\t" // QP,..., QP -@@ -306,7 +306,7 @@ static inline void RENAME(doVertLowPass) - : "r" (src), "r" ((long)stride), "m" (c->pQPb) - : "%"REG_a, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - const int l1= stride; - const int l2= stride + l1; - const int l3= stride + l2; -@@ -345,7 +345,7 @@ static inline void RENAME(doVertLowPass) - - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - #endif //HAVE_ALTIVEC - -@@ -364,7 +364,7 @@ static inline void RENAME(doVertLowPass) - */ - static inline void RENAME(vertRK1Filter)(uint8_t *src, int stride, int QP) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*3; - // FIXME rounding - asm volatile( -@@ -426,7 +426,7 @@ static inline void RENAME(vertRK1Filter) - : "r" (src), "r" ((long)stride) - : "%"REG_a, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - const int l1= stride; - const int l2= stride + l1; - const int l3= stride + l2; -@@ -449,7 +449,7 @@ static inline void RENAME(vertRK1Filter) - } - } - --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - #endif //0 - -@@ -462,7 +462,7 @@ static inline void RENAME(vertRK1Filter) - */ - static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*3; - - asm volatile( -@@ -548,7 +548,7 @@ static inline void RENAME(vertX1Filter)( - : "r" (src), "r" ((long)stride), "m" (co->pQPb) - : "%"REG_a, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - - const int l1= stride; - const int l2= stride + l1; -@@ -582,13 +582,13 @@ static inline void RENAME(vertX1Filter)( - } - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - - #ifndef HAVE_ALTIVEC - static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext *c) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - /* - uint8_t tmp[16]; - const int l1= stride; -@@ -1101,7 +1101,7 @@ static inline void RENAME(doVertDefFilte - : "r" ((long)stride), "m" (c->pQPb) - : "%"REG_a, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - const int l1= stride; - const int l2= stride + l1; - const int l3= stride + l2; -@@ -1139,14 +1139,14 @@ static inline void RENAME(doVertDefFilte - } - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - #endif //HAVE_ALTIVEC - - #ifndef HAVE_ALTIVEC - static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - asm volatile( - "pxor %%mm6, %%mm6 \n\t" - "pcmpeqb %%mm7, %%mm7 \n\t" -@@ -1370,7 +1370,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, - : : "r" (src), "r" ((long)stride), "m" (c->pQPb), "m"(c->pQPb2) - : "%"REG_a, "%"REG_d, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - int y; - int min=255; - int max=0; -@@ -1487,7 +1487,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, - // src[0] = src[7]=src[stride*7]=src[stride*7 + 7]=255; - } - #endif --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - #endif //HAVE_ALTIVEC - -@@ -1499,7 +1499,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, - */ - static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= 4*stride; - asm volatile( - "lea (%0, %1), %%"REG_a" \n\t" -@@ -1552,7 +1552,7 @@ static inline void RENAME(deInterlaceInt - */ - static inline void RENAME(deInterlaceInterpolateCubic)(uint8_t src[], int stride) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*3; - asm volatile( - "lea (%0, %1), %%"REG_a" \n\t" -@@ -1594,7 +1594,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , - : : "r" (src), "r" ((long)stride) - : "%"REG_a, "%"REG_d, "%"REG_c - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - int x; - src+= stride*3; - for(x=0; x<8; x++){ -@@ -1604,7 +1604,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , - src[stride*9] = CLIP((-src[stride*6] + 9*src[stride*8] + 9*src[stride*10] - src[stride*12])>>4); - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - - /** -@@ -1616,7 +1616,7 @@ DEINT_CUBIC((%%REGd, %1), (%0, %1, 8) , - */ - static inline void RENAME(deInterlaceFF)(uint8_t src[], int stride, uint8_t *tmp) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*4; - asm volatile( - "lea (%0, %1), %%"REG_a" \n\t" -@@ -1665,7 +1665,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), - : : "r" (src), "r" ((long)stride), "r"(tmp) - : "%"REG_a, "%"REG_d - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - int x; - src+= stride*4; - for(x=0; x<8; x++){ -@@ -1683,7 +1683,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), - - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - - /** -@@ -1695,7 +1695,7 @@ DEINT_FF((%%REGd, %1), (%%REGd, %1, 2), - */ - static inline void RENAME(deInterlaceL5)(uint8_t src[], int stride, uint8_t *tmp, uint8_t *tmp2) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= stride*4; - asm volatile( - "lea (%0, %1), %%"REG_a" \n\t" -@@ -1755,7 +1755,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), - : : "r" (src), "r" ((long)stride), "r"(tmp), "r"(tmp2) - : "%"REG_a, "%"REG_d - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - int x; - src+= stride*4; - for(x=0; x<8; x++){ -@@ -1784,7 +1784,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), - - src++; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - - /** -@@ -1796,7 +1796,7 @@ DEINT_L5(%%mm1, %%mm0, (%%REGd, %1, 2), - */ - static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uint8_t *tmp) - { --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - src+= 4*stride; - asm volatile( - "lea (%0, %1), %%"REG_a" \n\t" -@@ -1843,7 +1843,7 @@ static inline void RENAME(deInterlaceBle - : : "r" (src), "r" ((long)stride), "r" (tmp) - : "%"REG_a, "%"REG_d - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - int a, b, c, x; - src+= 4*stride; - -@@ -1886,7 +1886,7 @@ static inline void RENAME(deInterlaceBle - src += 4; - tmp += 4; - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - - /** -@@ -2191,7 +2191,7 @@ static inline void RENAME(tempNoiseReduc - - #define FAST_L2_DIFF - //#define L1_DIFF //u should change the thresholds too if u try that one --#if defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#if defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - asm volatile( - "lea (%2, %2, 2), %%"REG_a" \n\t" // 3*stride - "lea (%2, %2, 4), %%"REG_d" \n\t" // 5*stride -@@ -2479,7 +2479,7 @@ L2_DIFF_CORE((%0, %%REGc) , (%1, %%REGc - :: "r" (src), "r" (tempBlurred), "r"((long)stride), "m" (tempBlurredPast) - : "%"REG_a, "%"REG_d, "%"REG_c, "memory" - ); --#else //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#else //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - { - int y; - int d=0; -@@ -2562,7 +2562,7 @@ Switch between - } - } - } --#endif //defined (HAVE_MMX2) || defined (HAVE_3DNOW) -+#endif //defined (HAVE_MMX2) || defined (HAVE_AMD3DNOW) - } - #endif //HAVE_ALTIVEC - -@@ -3411,7 +3411,7 @@ static void RENAME(postProcess)(const ui - : "%"REG_a, "%"REG_d - ); - --#elif defined(HAVE_3DNOW) -+#elif defined(HAVE_AMD3DNOW) - //FIXME check if this is faster on an 3dnow chip or if it is faster without the prefetch or ... - /* prefetch(srcBlock + (((x>>3)&3) + 5)*srcStride + 32); - prefetch(srcBlock + (((x>>3)&3) + 9)*srcStride + 32); -@@ -3547,7 +3547,7 @@ static void RENAME(postProcess)(const ui - : "%"REG_a, "%"REG_d - ); - --#elif defined(HAVE_3DNOW) -+#elif defined(HAVE_AMD3DNOW) - //FIXME check if this is faster on an 3dnow chip or if it is faster without the prefetch or ... - /* prefetch(srcBlock + (((x>>3)&3) + 5)*srcStride + 32); - prefetch(srcBlock + (((x>>3)&3) + 9)*srcStride + 32); -@@ -3699,7 +3699,7 @@ static void RENAME(postProcess)(const ui - + dstBlock[x +14*dstStride] + dstBlock[x +15*dstStride]; - }*/ - } --#ifdef HAVE_3DNOW -+#ifdef HAVE_AMD3DNOW - asm volatile("femms"); - #elif defined (HAVE_MMX) - asm volatile("emms"); diff --git a/ffmpeg.spec b/ffmpeg.spec index dd9306f..37b93a8 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,20 +1,17 @@ # TODO: add make test to %%check section -%define svn 20080908 +%define svn 20081202 %define faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 -Release: 0.52.%{svn}%{?dist} +Release: 0.53.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2 Source1: %{name}-snapshot.sh -Patch0: %{name}-cpu.patch -Patch1: %{name}-cmov.patch -Patch4: %{name}-asmreg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} @@ -103,9 +100,6 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{svn} -%patch0 -p1 -b .cpu -%patch1 -p1 -b .cmov -%patch4 -p1 -b .asmreg %build mkdir generic @@ -114,9 +108,7 @@ pushd generic --shlibdir=%{_libdir} \ %ifarch %{ix86} --cpu=%{_target_cpu} \ - --disable-amd3dnow \ --disable-mmx \ - --disable-sse \ %endif %ifarch ppc ppc64 --disable-altivec \ @@ -124,9 +116,6 @@ pushd generic %ifarch sparc sparc64 --disable-vis \ %endif -%ifarch x86_64 - --disable-amd3dnow \ -%endif make %{?_smp_mflags} popd @@ -137,8 +126,6 @@ pushd sse2 %{ff_configure}\ --shlibdir=%{_libdir}/sse2 \ --cpu=i686 \ - --disable-amd3dnow \ - --disable-ssse3 \ --disable-ffmpeg \ --disable-ffserver \ --disable-ffplay \ @@ -263,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 04 2008 Dominik Mierzejewski - 0.4.9-0.53.20081202 +- 20081202 snapshot +- drop upstreamed/obsolete patches + * Thu Nov 20 2008 Dominik Mierzejewski - 0.4.9-0.52.20080908 - add obsoletes for -compat package (RPMFusion bug #173) diff --git a/sources b/sources index 9bc6cb7..69bc3b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0165b69b8e5bfc7a82fcf2247269b84b ffmpeg-20080908.tar.bz2 +231d71e5cc6101ac8fb8403b76758877 ffmpeg-20081202.tar.bz2