no need to disable these SSE2 functions on i386 ater the recent

libpthread changes
This commit is contained in:
jakemsr 2008-01-30 03:58:52 +00:00
parent c83e455e07
commit dde77bb137
3 changed files with 2 additions and 36 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2008/01/26 01:56:02 jakemsr Exp $
# $OpenBSD: Makefile,v 1.35 2008/01/30 03:58:52 jakemsr Exp $
COMMENT= audio/video converter and streamer with bktr(4) support
V= 20080118
DISTNAME= ffmpeg-svn-${V}
PKGNAME= ffmpeg-${V}
PKGNAME= ffmpeg-${V}p0
SHARED_LIBS= avutil 5.0 \
avcodec 11.0 \
avformat 11.0 \

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-libavcodec_i386_dsputil_mmx_c,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
--- libavcodec/i386/dsputil_mmx.c.orig Mon Jan 21 01:28:41 2008
+++ libavcodec/i386/dsputil_mmx.c Mon Jan 21 01:30:33 2008
@@ -3175,9 +3175,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *a
#ifdef CONFIG_ENCODERS
const int dct_algo = avctx->dct_algo;
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
+#ifdef ARCH_X86_64
if(mm_flags & MM_SSE2){
c->fdct = ff_fdct_sse2;
- }else if(mm_flags & MM_MMXEXT){
+ }else
+#endif
+ if(mm_flags & MM_MMXEXT){
c->fdct = ff_fdct_mmx2;
}else{
c->fdct = ff_fdct_mmx;

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-libavcodec_i386_mpegvideo_mmx_c,v 1.1 2008/01/26 01:56:02 jakemsr Exp $
--- libavcodec/i386/mpegvideo_mmx.c.orig Fri Dec 14 23:56:43 2007
+++ libavcodec/i386/mpegvideo_mmx.c Mon Jan 21 11:00:22 2008
@@ -732,9 +732,12 @@ void MPV_common_init_mmx(MpegEncContext *s)
s->dct_quantize= dct_quantize_SSSE3;
} else
#endif
+#ifdef ARCH_X86_64
if(mm_flags & MM_SSE2){
s->dct_quantize= dct_quantize_SSE2;
- } else if(mm_flags & MM_MMXEXT){
+ } else
+#endif
+ if(mm_flags & MM_MMXEXT){
s->dct_quantize= dct_quantize_MMX2;
} else {
s->dct_quantize= dct_quantize_MMX;