summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2001-09-23 17:44:33 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2001-09-23 17:44:33 +0000
commita569cc92713b06f6bea1a4748c5c138a5d99fb05 (patch)
tree0879749bc5a544c051bf9148f84ee11be71e6687
parent709d5f22d833c518593cbf53b5e92bd8b94f2f28 (diff)
downloadxine-lib-a569cc92713b06f6bea1a4748c5c138a5d99fb05.tar.gz
xine-lib-a569cc92713b06f6bea1a4748c5c138a5d99fb05.tar.bz2
Don't try to use "emms" on a pentium without MMX
CVS patchset: 688 CVS date: 2001/09/23 17:44:33
-rw-r--r--src/libffmpeg/xine_decoder.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index c67469e09..45823745a 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.13 2001/09/18 17:41:47 jkeil Exp $
+ * $Id: xine_decoder.c,v 1.14 2001/09/23 17:44:33 jkeil Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -39,6 +39,7 @@
#include "metronom.h"
#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
/* now this is ripped of wine's vfw.h */
typedef struct {
@@ -213,7 +214,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
&got_picture, this->buf,
this->size);
#ifdef ARCH_X86
- emms ();
+ emms_c ();
#endif
img = this->video_out->get_frame (this->video_out,