- sync ffmpeg to cvs (sorry Mike it still doesn't decode your teststream --

something must be broken at ffmpeg, also happens with mplayer)
- added priority sorted lists, now autoprobing should work again.
- fixed infinite loop in plugin loader.
obs: latest ffmpeg contains ppc optimizations, someone will have to enable these
though.

CVS patchset: 2676
CVS date: 2002/09/16 21:49:34

1 files changed, 8 insertions, 1 deletions

diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
index 4539b6464..c380eb45f 100644
--- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
+++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
@@ -18,6 +18,7 @@
  */
 
 #include "../dsputil.h"
+#include "../mpegvideo.h"
 
 #include <mlib_types.h>
 #include <mlib_status.h>
@@ -125,7 +126,6 @@ void ff_fdct_mlib(DCTELEM *data)
 
 void dsputil_init_mlib(void)
 {
-    av_fdct = ff_fdct_mlib;
     ff_idct = ff_idct_mlib;
 
     put_pixels_tab[0] = put_pixels_mlib;
@@ -142,3 +142,10 @@ void dsputil_init_mlib(void)
     
     add_pixels_clamped = add_pixels_clamped_mlib;
 }
+
+void MPV_common_init_mlib(MpegEncContext *s)
+{
+    if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){
+	s->fdct = ff_fdct_mlib;
+    }
+}