sync ffmpeg

- add wma decoder
- fix mmx macro
- remove changes from fdct_mmx.c (it should work fine now with the mmx macro fix)

CVS patchset: 3234
CVS date: 2002/11/11 13:45:34

1 files changed, 7 insertions, 1 deletions

diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c
index fcd65364b..77e4e750d 100644
--- a/src/libffmpeg/libavcodec/utils.c
+++ b/src/libffmpeg/libavcodec/utils.c
@@ -120,6 +120,9 @@ int avcodec_encode_video(AVCodecContext *avctx, UINT8 *buf, int buf_size,
     int ret;
 
     ret = avctx->codec->encode(avctx, buf, buf_size, (void *)pict);
+    
+    emms_c(); //needed to avoid a emms_c() call before every return;
+
     avctx->frame_number++;
     return ret;
 }
@@ -135,6 +138,9 @@ int avcodec_decode_video(AVCodecContext *avctx, AVPicture *picture,
 
     ret = avctx->codec->decode(avctx, picture, got_picture_ptr, 
                                buf, buf_size);
+
+    emms_c(); //needed to avoid a emms_c() call before every return;
+
     if (*got_picture_ptr)                           
         avctx->frame_number++;
     return ret;
@@ -464,7 +470,7 @@ void avcodec_init(void)
 	return;
     inited = 1;
 
-    dsputil_init();
+    //dsputil_init();
 }
 
 /* this should be called after seeking and before trying to decode the next frame */