mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
Add some stuff to disable bad asm code
Original commit message from CVS: Add some stuff to disable bad asm code
This commit is contained in:
David Schleef
parent
3e318d8049
commit
cb1962b920
1 changed files with 101 additions and 16 deletions
|
|
@ -1,6 +1,64 @@
|
|||
diff -ur ffmpeg-vanilla/libavformat/allformats.c ffmpeg/libavformat/allformats.c
|
||||
--- ffmpeg-vanilla/libavformat/allformats.c Thu May 29 18:34:46 2003
|
||||
+++ ffmpeg/libavformat/allformats.c Thu May 29 19:02:01 2003
|
||||
Index: ffmpeg/libavcodec/i386/mpegvideo_mmx.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx.c,v
|
||||
retrieving revision 1.25
|
||||
diff -u -u -r1.25 mpegvideo_mmx.c
|
||||
--- ffmpeg/libavcodec/i386/mpegvideo_mmx.c 14 May 2003 15:12:13 -0000 1.25
|
||||
+++ ffmpeg/libavcodec/i386/mpegvideo_mmx.c 11 Sep 2003 19:34:45 -0000
|
||||
@@ -488,6 +488,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#if 0
|
||||
#undef HAVE_MMX2
|
||||
#define RENAME(a) a ## _MMX
|
||||
#include "mpegvideo_mmx_template.c"
|
||||
@@ -496,6 +497,7 @@
|
||||
#undef RENAME
|
||||
#define RENAME(a) a ## _MMX2
|
||||
#include "mpegvideo_mmx_template.c"
|
||||
+#endif
|
||||
|
||||
void MPV_common_init_mmx(MpegEncContext *s)
|
||||
{
|
||||
@@ -508,6 +510,7 @@
|
||||
|
||||
draw_edges = draw_edges_mmx;
|
||||
|
||||
+#if 0
|
||||
if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
|
||||
if(mm_flags & MM_MMXEXT){
|
||||
s->dct_quantize= dct_quantize_MMX2;
|
||||
@@ -515,5 +518,6 @@
|
||||
s->dct_quantize= dct_quantize_MMX;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
Index: ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
|
||||
retrieving revision 1.17
|
||||
diff -u -u -r1.17 mpegvideo_mmx_template.c
|
||||
--- ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c 13 May 2003 08:21:35 -0000 1.17
|
||||
+++ ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c 11 Sep 2003 19:34:47 -0000
|
||||
@@ -122,7 +122,7 @@
|
||||
"movd %%mm3, %%eax \n\t"
|
||||
"movzbl %%al, %%eax \n\t" // last_non_zero_p1
|
||||
: "+a" (last_non_zero_p1)
|
||||
- : "r" (block+64), "r" (qmat), "r" (bias),
|
||||
+ : "b" (block+64), "r" (qmat), "r" (bias),
|
||||
"r" (inv_zigzag_direct16+64), "r" (temp_block+64)
|
||||
);
|
||||
// note the asm is split cuz gcc doesnt like that many operands ...
|
||||
Index: ffmpeg/libavformat/allformats.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
|
||||
retrieving revision 1.15
|
||||
diff -u -u -r1.15 allformats.c
|
||||
--- ffmpeg/libavformat/allformats.c 5 Jun 2003 14:30:52 -0000 1.15
|
||||
+++ ffmpeg/libavformat/allformats.c 11 Sep 2003 19:34:47 -0000
|
||||
@@ -40,13 +40,13 @@
|
||||
#endif
|
||||
avienc_init();
|
||||
|
|
@ -16,12 +74,16 @@ diff -ur ffmpeg-vanilla/libavformat/allformats.c ffmpeg/libavformat/allformats.c
|
|||
+ avf_dv_init();
|
||||
fourxm_init();
|
||||
|
||||
av_register_output_format(&yuv4mpegpipe_oformat);
|
||||
diff -ur ffmpeg-vanilla/libavformat/avformat.h ffmpeg/libavformat/avformat.h
|
||||
--- ffmpeg-vanilla/libavformat/avformat.h Thu May 29 18:34:46 2003
|
||||
+++ ffmpeg/libavformat/avformat.h Thu May 29 19:02:09 2003
|
||||
@@ -311,7 +311,7 @@
|
||||
int au_init(void);
|
||||
#ifdef AMR_NB
|
||||
Index: ffmpeg/libavformat/avformat.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v
|
||||
retrieving revision 1.55
|
||||
diff -u -u -r1.55 avformat.h
|
||||
--- ffmpeg/libavformat/avformat.h 4 Jul 2003 23:48:20 -0000 1.55
|
||||
+++ ffmpeg/libavformat/avformat.h 11 Sep 2003 19:34:48 -0000
|
||||
@@ -317,7 +317,7 @@
|
||||
int amr_init(void);
|
||||
|
||||
/* wav.c */
|
||||
-int wav_init(void);
|
||||
|
|
@ -29,7 +91,7 @@ diff -ur ffmpeg-vanilla/libavformat/avformat.h ffmpeg/libavformat/avformat.h
|
|||
|
||||
/* raw.c */
|
||||
int raw_init(void);
|
||||
@@ -320,7 +320,7 @@
|
||||
@@ -326,7 +326,7 @@
|
||||
int ogg_init(void);
|
||||
|
||||
/* dv.c */
|
||||
|
|
@ -38,9 +100,13 @@ diff -ur ffmpeg-vanilla/libavformat/avformat.h ffmpeg/libavformat/avformat.h
|
|||
|
||||
/* ffm.c */
|
||||
int ffm_init(void);
|
||||
diff -ur ffmpeg-vanilla/libavformat/dv.c ffmpeg/libavformat/dv.c
|
||||
--- ffmpeg-vanilla/libavformat/dv.c Thu May 29 18:34:46 2003
|
||||
+++ ffmpeg/libavformat/dv.c Thu May 29 19:01:16 2003
|
||||
Index: ffmpeg/libavformat/dv.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/dv.c,v
|
||||
retrieving revision 1.9
|
||||
diff -u -u -r1.9 dv.c
|
||||
--- ffmpeg/libavformat/dv.c 23 Apr 2003 02:04:40 -0000 1.9
|
||||
+++ ffmpeg/libavformat/dv.c 11 Sep 2003 19:34:48 -0000
|
||||
@@ -138,7 +138,7 @@
|
||||
dv_write_trailer,
|
||||
};
|
||||
|
|
@ -50,9 +116,28 @@ diff -ur ffmpeg-vanilla/libavformat/dv.c ffmpeg/libavformat/dv.c
|
|||
{
|
||||
av_register_input_format(&dv_iformat);
|
||||
av_register_output_format(&dv_oformat);
|
||||
diff -ur ffmpeg-vanilla/libavformat/wav.c ffmpeg/libavformat/wav.c
|
||||
--- ffmpeg-vanilla/libavformat/wav.c Thu May 29 18:34:46 2003
|
||||
+++ ffmpeg/libavformat/wav.c Thu May 29 19:02:32 2003
|
||||
Index: ffmpeg/libavformat/utils.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
|
||||
retrieving revision 1.52
|
||||
diff -u -u -r1.52 utils.c
|
||||
--- ffmpeg/libavformat/utils.c 4 Jul 2003 23:08:16 -0000 1.52
|
||||
+++ ffmpeg/libavformat/utils.c 11 Sep 2003 19:34:52 -0000
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
+#include <stdio.h>
|
||||
|
||||
#ifndef HAVE_STRPTIME
|
||||
#include "strptime.h"
|
||||
Index: ffmpeg/libavformat/wav.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
|
||||
retrieving revision 1.23
|
||||
diff -u -u -r1.23 wav.c
|
||||
--- ffmpeg/libavformat/wav.c 12 Mar 2003 18:45:50 -0000 1.23
|
||||
+++ ffmpeg/libavformat/wav.c 11 Sep 2003 19:34:52 -0000
|
||||
@@ -334,7 +334,7 @@
|
||||
wav_write_trailer,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue