Merge commit '85bfaa4949f4afcde19061def3e8a18988964858'

[ffmpeg] / libavfilter / vf_overlay.h

diff --git a/libavfilter/vf_overlay.h b/libavfilter/vf_overlay.h
index 072ece358f48b5e2525ac47aa5385f983801df82..98b06eaacfc87a1969b97a9643ff9311b87dd489 100644 (file)
--- a/libavfilter/vf_overlay.h
+++ b/libavfilter/vf_overlay.h
@@ -80,6 +80,7 @@ typedef struct OverlayContext {
     int (*blend_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
 } OverlayContext;
 
-void ff_overlay_init_x86(OverlayContext *s, int format, int alpha_format, int main_has_alpha);
+void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format,
+                         int alpha_format, int main_has_alpha);
 
 #endif /* AVFILTER_OVERLAY_H */