Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / asrc_abuffer.c

diff --git a/libavfilter/asrc_abuffer.c b/libavfilter/asrc_abuffer.c
index bfa7e63f2a00dcf7e2fc566dfe9416f3cb904f48..ad71e12c5bea77db8604d1164eaf54317d60f7c0 100644 (file)
--- a/libavfilter/asrc_abuffer.c
+++ b/libavfilter/asrc_abuffer.c
@@ -241,7 +241,7 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
 
     av_samples_fill_arrays(data, linesize,
                            buf, nb_channels, nb_samples,
-                           sample_fmt, planar, 16);
+                           sample_fmt, 16);
 
     return av_asrc_buffer_add_samples(ctx,
                                       data, linesize, nb_samples,
@@ -362,8 +362,8 @@ AVFilter avfilter_asrc_abuffer = {
     .init        = init,
     .uninit      = uninit,
 
-    .inputs      = (AVFilterPad[]) {{ .name = NULL }},
-    .outputs     = (AVFilterPad[]) {{ .name            = "default",
+    .inputs      = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs     = (const AVFilterPad[]) {{ .name      = "default",
                                       .type            = AVMEDIA_TYPE_AUDIO,
                                       .request_frame   = request_frame,
                                       .poll_frame      = poll_frame,