Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684).

[ffmpeg] / libavcodec / svq3.c

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index af9c40d5173c2859b72748975dd42e70c072d978..b367a7f272a811b1aecf68b4fdd50e9cc1b90e1a 100644 (file)
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -47,14 +47,11 @@
 
 #include "h264data.h" //FIXME FIXME FIXME
 
+#include "h264_mvpred.h"
 #include "golomb.h"
 #include "rectangle.h"
 #include "vdpau_internal.h"
 
-#if ARCH_X86
-#include "x86/h264_i386.h"
-#endif
-
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
@@ -129,7 +126,7 @@ static const uint32_t svq3_dequant_coeff[32] = {
 };
 
 
-void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
+void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
 {
     const int qmul = svq3_dequant_coeff[qp];
 #define stride 16
@@ -166,7 +163,7 @@ void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
 }
 #undef stride
 
-void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp,
+void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp,
                             int dc)
 {
     const int qmul = svq3_dequant_coeff[qp];