]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/af_aresample.c
vf_crop: remove mathematical constants now redundant.
[ffmpeg] / libavfilter / af_aresample.c
index 31e1b5a4e3ca64703bc02911d462d721c7decd44..9af50cf208131c4cc19250715b0656285ed1732a 100644 (file)
@@ -104,12 +104,12 @@ static int query_formats(AVFilterContext *ctx)
         return AVERROR(ENOMEM);
     avfilter_set_common_sample_formats(ctx, formats);
 
-    formats = avfilter_all_channel_layouts();
+    formats = avfilter_make_all_channel_layouts();
     if (!formats)
         return AVERROR(ENOMEM);
     avfilter_set_common_channel_layouts(ctx, formats);
 
-    formats = avfilter_all_packing_formats();
+    formats = avfilter_make_all_packing_formats();
     if (!formats)
         return AVERROR(ENOMEM);
     avfilter_set_common_packing_formats(ctx, formats);
@@ -268,13 +268,8 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamplesref
         if (aresample->outsamplesref)
             avfilter_unref_buffer(aresample->outsamplesref);
 
-        aresample->outsamplesref = avfilter_get_audio_buffer(outlink,
-                                                            AV_PERM_WRITE | AV_PERM_REUSE2,
-                                                            inlink->format,
-                                                            requested_out_nb_samples,
-                                                            insamplesref->audio->channel_layout,
-                                                            insamplesref->audio->planar);
-
+        aresample->outsamplesref =
+            avfilter_get_audio_buffer(outlink, AV_PERM_WRITE, requested_out_nb_samples);
         avfilter_copy_buffer_ref_props(aresample->outsamplesref, insamplesref);
         aresample->outsamplesref->pts =
             insamplesref->pts / inlink->sample_rate * outlink->sample_rate;