imc: fix undefined float to int conversion

[ffmpeg] / libavcodec / jfdctfst.c

diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index 38424563d181bf0e541489862f930128a616e996..b911909ec3939759d9b90a6b765a1d57d2f08a46 100644 (file)
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -64,19 +64,18 @@
  */
 
 /**
- * @file jfdctfst.c
+ * @file
  * Independent JPEG Group's fast AAN dct.
  */
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define DCTSIZE 8
 #define GLOBAL(x) x
 #define RIGHT_SHIFT(x, n) ((x) >> (n))
-#define SHIFT_TEMPS
 
 /*
  * This module is specialized to the case DCTSIZE = 8.
@@ -145,13 +144,12 @@
 
 #define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
 
-static always_inline void row_fdct(DCTELEM * data){
+static av_always_inline void row_fdct(DCTELEM * data){
   int_fast16_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
   int_fast16_t tmp10, tmp11, tmp12, tmp13;
   int_fast16_t z1, z2, z3, z4, z5, z11, z13;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   /* Pass 1: process rows. */
 
@@ -216,7 +214,6 @@ fdct_ifast (DCTELEM * data)
   int_fast16_t z1, z2, z3, z4, z5, z11, z13;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);
 
@@ -283,7 +280,6 @@ fdct_ifast248 (DCTELEM * data)
   int_fast16_t z1;
   DCTELEM *dataptr;
   int ctr;
-  SHIFT_TEMPS
 
   row_fdct(data);