Commit d29f0a60 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: Update FFMPEG to HEAD because there were many fixes in H264 decoding lately.

parent 1ef79a2b
......@@ -1067,7 +1067,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN
ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg -r 14080
$(SVN) co $(FFMPEG_SVN) ffmpeg -r 14661
ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
endif
......@@ -1084,7 +1084,7 @@ ifdef HAVE_DARWIN_OS
(cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
endif
ifdef NO_TEXT_RELOCATION
(cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
endif
ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-uclibc.patch
......@@ -2454,10 +2454,9 @@ endif
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
touch $@
CLEAN_FILE += .schroedinger
CLEAN_PKG += schroedinger
DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
CLEAN_FILE += .libass
CLEAN_PKG += libass
DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
# ***************************************************************************
# Some cleaning
......
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 572e607..4608d9d 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -563,10 +563,6 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride,
Index: libpostproc/postprocess.c
===================================================================
--- libpostproc/postprocess.c (révision 14661)
+++ libpostproc/postprocess.c (copie de travail)
@@ -552,9 +552,6 @@
//Note: we have C, MMX, MMX2, 3DNOW version there is no 3DNOW+MMX2 one
//Plain C versions
-#if !defined (HAVE_MMX) || defined (RUNTIME_CPUDETECT)
-#define COMPILE_C
-#endif
-
#ifdef ARCH_POWERPC
#ifdef HAVE_ALTIVEC
#define COMPILE_ALTIVEC
@@ -575,17 +571,8 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride,
@@ -562,17 +559,8 @@
#if defined(ARCH_X86)
-#if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
-#define COMPILE_MMX
-#endif
-
+#define COMPILE_C
-#if defined (HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
-#define COMPILE_MMX2
-#endif
+#define COMPILE_C
-
-#if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
-#define COMPILE_3DNOW
-#endif
#endif /* defined(ARCH_X86) */
#undef HAVE_MMX
@@ -655,15 +642,7 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[]
// someone might exchange the CPU whithout restarting MPlayer ;)
@@ -640,15 +628,7 @@
// someone might exchange the CPU whithout restarting MPlayer ;)
#ifdef RUNTIME_CPUDETECT
#if defined(ARCH_X86)
- // ordered per speed fastest first
- if(c->cpuCaps & PP_CPU_CAPS_MMX2)
- postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else if(c->cpuCaps & PP_CPU_CAPS_3DNOW)
- postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else if(c->cpuCaps & PP_CPU_CAPS_MMX)
- postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else
- postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
+ postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- // ordered per speed fastest first
- if(c->cpuCaps & PP_CPU_CAPS_MMX2)
- postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else if(c->cpuCaps & PP_CPU_CAPS_3DNOW)
- postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else if(c->cpuCaps & PP_CPU_CAPS_MMX)
- postProcess_MMX(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
- else
- postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
+ postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);
#else
#ifdef ARCH_POWERPC
#ifdef HAVE_ALTIVEC
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index faf3e95..d226e49 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -158,6 +158,7 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
#define RENAME(a) a ## _C
#include "rgb2rgb_template.c"
if(c->cpuCaps & PP_CPU_CAPS_ALTIVEC)
Index: libswscale/yuv2rgb.c
===================================================================
--- libswscale/yuv2rgb.c (révision 27432)
+++ libswscale/yuv2rgb.c (copie de travail)
@@ -148,6 +148,7 @@
};
#endif
+#if 0
#if defined(ARCH_X86) && defined(CONFIG_GPL)
#ifdef HAVE_MMX
//MMX versions
@@ -188,6 +189,7 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
#include "rgb2rgb_template.c"
/* hope these constant values are cache line aligned */
@@ -181,6 +182,7 @@
#include "yuv2rgb_template.c"
#endif //ARCH_X86 || ARCH_X86_64
#endif /* HAVE_MMX */
+#endif
/*
rgb15->rgb16 Original by Strepto/Astral
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 5e3c0a9..359ef14 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -875,9 +875,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l
const int32_t Inverse_Table_6_9[8][4] = {
{117504, 138453, 13954, 34903}, /* no sequence_display_extension */
Index: libswscale/swscale.c
===================================================================
--- libswscale/swscale.c (révision 27432)
+++ libswscale/swscale.c (copie de travail)
@@ -820,9 +820,7 @@
//Note: we have C, X86, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
//Plain C versions
......@@ -83,7 +82,7 @@ index 5e3c0a9..359ef14 100644
#ifdef ARCH_POWERPC
#if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
@@ -885,6 +883,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l
@@ -830,6 +828,7 @@
#endif //HAVE_ALTIVEC
#endif //ARCH_POWERPC
......@@ -91,7 +90,7 @@ index 5e3c0a9..359ef14 100644
#if defined(ARCH_X86)
#if ((defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
@@ -899,6 +898,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l
@@ -844,6 +843,7 @@
#define COMPILE_3DNOW
#endif
#endif //ARCH_X86 || ARCH_X86_64
......@@ -99,7 +98,7 @@ index 5e3c0a9..359ef14 100644
#undef HAVE_MMX
#undef HAVE_MMX2
@@ -1544,15 +1544,8 @@ static SwsFunc getSwsFunc(int flags){
@@ -1490,15 +1490,8 @@
#if defined(RUNTIME_CPUDETECT) && defined (CONFIG_GPL)
#if defined(ARCH_X86)
// ordered per speed fastest first
......@@ -117,23 +116,23 @@ index 5e3c0a9..359ef14 100644
#else
#ifdef ARCH_POWERPC
if (flags & SWS_CPU_CAPS_ALTIVEC)
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 8ece0f6..6dac051 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -156,6 +156,7 @@ const uint8_t __attribute__((aligned(8))) dither_8x8_220[8][8]={
};
#endif
Index: libswscale/rgb2rgb.c
===================================================================
--- libswscale/rgb2rgb.c (révision 27432)
+++ libswscale/rgb2rgb.c (copie de travail)
@@ -158,6 +158,7 @@
#define RENAME(a) a ## _C
#include "rgb2rgb_template.c"
+#if 0
#ifdef HAVE_MMX
#if defined(ARCH_X86) && defined(CONFIG_GPL)
/* hope these constant values are cache line aligned */
@@ -189,6 +190,7 @@ static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither;
#include "yuv2rgb_template.c"
//MMX versions
@@ -188,6 +189,7 @@
#include "rgb2rgb_template.c"
#endif /* defined(ARCH_X86) */
#endif //ARCH_X86 || ARCH_X86_64
+#endif
const int32_t Inverse_Table_6_9[8][4] = {
{117504, 138453, 13954, 34903}, /* no sequence_display_extension */
/*
RGB15->RGB16 original by Strepto/Astral
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment