Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

[ffmpeg] / libavcodec / videodsp_template.c

diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c
index 44f6a4d63e082fa3a9910e805b79848edc3bb374..1f709c499dbec4b7e6066e53768bb5f6c01451d9 100644 (file)
--- a/libavcodec/videodsp_template.c
+++ b/libavcodec/videodsp_template.c
@@ -27,7 +27,7 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
 {
     int x, y;
     int start_y, start_x, end_y, end_x;
-    int linesize = linesize_arg;
+    emuedge_linesize_type linesize = linesize_arg;
 
     if (!w || !h)
         return;