dvbsubdec: Fix function return type

[ffmpeg] / libavcodec / vc1dsp.c

diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index 5adcb6263570844c5937bd33badef5bb80b26eaf..a193dd704d06a84c44992d648aa33c5a67ed659d 100644 (file)
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -29,6 +29,7 @@
 #include "h264chroma.h"
 #include "qpeldsp.h"
 #include "vc1dsp.h"
+#include "startcode.h"
 
 /* Apply overlap transform to horizontal edge */
 static void vc1_v_overlap_c(uint8_t *src, int stride)
@@ -682,6 +683,19 @@ PUT_VC1_MSPEL(1, 3)
 PUT_VC1_MSPEL(2, 3)
 PUT_VC1_MSPEL(3, 3)
 
+
+static void put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src,
+                                 ptrdiff_t stride, int rnd)
+{
+    ff_put_pixels8x8_c(dst, src, stride);
+}
+
+static void avg_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src,
+                                 ptrdiff_t stride, int rnd)
+{
+    ff_avg_pixels8x8_c(dst, src, stride);
+}
+
 #define chroma_mc(a) \
     ((A * src[a] + B * src[a + 1] + \
       C * src[stride + a] + D * src[stride + a + 1] + 32 - 4) >> 6)
@@ -888,7 +902,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp)
     dsp->vc1_v_loop_filter16  = vc1_v_loop_filter16_c;
     dsp->vc1_h_loop_filter16  = vc1_h_loop_filter16_c;
 
-    dsp->put_vc1_mspel_pixels_tab[0]  = ff_put_pixels8x8_c;
+    dsp->put_vc1_mspel_pixels_tab[0]  = put_vc1_mspel_mc00_c;
     dsp->put_vc1_mspel_pixels_tab[1]  = put_vc1_mspel_mc10_c;
     dsp->put_vc1_mspel_pixels_tab[2]  = put_vc1_mspel_mc20_c;
     dsp->put_vc1_mspel_pixels_tab[3]  = put_vc1_mspel_mc30_c;
@@ -905,7 +919,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp)
     dsp->put_vc1_mspel_pixels_tab[14] = put_vc1_mspel_mc23_c;
     dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_c;
 
-    dsp->avg_vc1_mspel_pixels_tab[0]  = ff_avg_pixels8x8_c;
+    dsp->avg_vc1_mspel_pixels_tab[0]  = avg_vc1_mspel_mc00_c;
     dsp->avg_vc1_mspel_pixels_tab[1]  = avg_vc1_mspel_mc10_c;
     dsp->avg_vc1_mspel_pixels_tab[2]  = avg_vc1_mspel_mc20_c;
     dsp->avg_vc1_mspel_pixels_tab[3]  = avg_vc1_mspel_mc30_c;
@@ -935,6 +949,8 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp)
     dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c;
 #endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */
 
+    dsp->startcode_find_candidate = ff_startcode_find_candidate_c;
+
     if (ARCH_AARCH64)
         ff_vc1dsp_init_aarch64(dsp);
     if (ARCH_ARM)