Indeo 5 decoder

[ffmpeg] / libavcodec / bfin / mpegvideo_bfin.c

diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c
index 9dd121bafdafc29f53d9961bf7e188fd306661ea..0373e22ff8254006291a94501105a52ca0220f41 100644 (file)
--- a/libavcodec/bfin/mpegvideo_bfin.c
+++ b/libavcodec/bfin/mpegvideo_bfin.c
@@ -20,15 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_bfin.h"
 
-
-extern void ff_bfin_fdct (DCTELEM *block) attribute_l1_text;
-
-
 static int dct_quantize_bfin (MpegEncContext *s,
                               DCTELEM *block, int n,
                               int qscale, int *overflow)
@@ -41,7 +37,7 @@ static int dct_quantize_bfin (MpegEncContext *s,
     int   max=0;
 
     PROF("fdct",0);
-    ff_bfin_fdct (block);
+    s->dsp.fdct(block);
     EPROF();
 
     PROF("denoise",1);
@@ -88,7 +84,7 @@ static int dct_quantize_bfin (MpegEncContext *s,
     /*      block[i] = level;                                 */
     /*  } */
 
-    asm volatile
+    __asm__ volatile
         ("i2=%1;\n\t"
          "r1=[%1++];                                                         \n\t"
          "r0=r1>>>15 (v);                                                    \n\t"
@@ -114,7 +110,7 @@ static int dct_quantize_bfin (MpegEncContext *s,
 
     PROF("zzscan",5);
 
-    asm volatile
+    __asm__ volatile
         ("r0=b[%1--] (x);         \n\t"
          "lsetup (0f,1f) lc0=%3;  \n\t"     /*    for(i=63; i>=start_i; i--) { */
          "0: p0=r0;               \n\t"     /*        j = scantable[i];        */
@@ -147,6 +143,6 @@ static int dct_quantize_bfin (MpegEncContext *s,
 
 void MPV_common_init_bfin (MpegEncContext *s)
 {
-    s->dct_quantize= dct_quantize_bfin;
+/*     s->dct_quantize= dct_quantize_bfin; */
 }