Bump micro version, related to r28491.

[ffmpeg.git] / libswscale / yuv2rgb_bfin.c

diff --git a/libswscale/yuv2rgb_bfin.c b/libswscale/yuv2rgb_bfin.c
index 1500a96..58cc5b6 100644 (file)
--- a/libswscale/yuv2rgb_bfin.c
+++ b/libswscale/yuv2rgb_bfin.c
@@ -27,9 +27,6 @@
 #include <inttypes.h>
 #include <assert.h>
 #include "config.h"
 #include <inttypes.h>
 #include <assert.h>
 #include "config.h"

-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif

 #include <unistd.h>
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include <unistd.h>
 #include "rgb2rgb.h"
 #include "swscale.h"


@@ -41,17 +38,17 @@
 #define L1CODE
 #endif
 
 #define L1CODE
 #endif
 

-extern void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
-                                     int w, uint32_t *coeffs) L1CODE;
+void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
+                              int w, uint32_t *coeffs) L1CODE;

 
 

-extern void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
-                                     int w, uint32_t *coeffs) L1CODE;
+void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
+                              int w, uint32_t *coeffs) L1CODE;

 
 

-extern void ff_bfin_yuv2rgb24_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
-                                    int w, uint32_t *coeffs) L1CODE;
+void ff_bfin_yuv2rgb24_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
+                             int w, uint32_t *coeffs) L1CODE;

 
 

-typedef void (* ltransform_t)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
-                              int w, uint32_t *coeffs);
+typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
+                            int w, uint32_t *coeffs);

 
 
 static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks)
 
 
 static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks)


@@ -95,7 +92,7 @@ static int core_yuv420_rgb (SwsContext *c,
                             uint8_t **in, int *instrides,
                             int srcSliceY, int srcSliceH,
                             uint8_t **oplanes, int *outstrides,
                             uint8_t **in, int *instrides,
                             int srcSliceY, int srcSliceH,
                             uint8_t **oplanes, int *outstrides,

-                            ltransform_t lcscf, int rgb, int masks)
+                            ltransform lcscf, int rgb, int masks)

 {
     uint8_t *py,*pu,*pv,*op;
     int w  = instrides[0];
 {
     uint8_t *py,*pu,*pv,*op;
     int w  = instrides[0];