X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faudio.h;h=a84c378ec82973f1ea1f7cb81343622b62058808;hb=b1b84b068d20d29aa9e1c0cc3a989e293138997c;hp=b63f85f45c1635797706d35650dfd6b72a4bbc6d;hpb=394b692b70587af74a6957640cab0dce3bc9934d;p=ffmpeg

diff --git a/libavfilter/audio.h b/libavfilter/audio.h
index b63f85f45c1..a84c378ec82 100644
--- a/libavfilter/audio.h
+++ b/libavfilter/audio.h
@@ -24,7 +24,7 @@
 
 #include "avfilter.h"
 
-static const enum AVSampleFormat ff_packed_sample_fmts[] = {
+static const enum AVSampleFormat ff_packed_sample_fmts_array[] = {
     AV_SAMPLE_FMT_U8,
     AV_SAMPLE_FMT_S16,
     AV_SAMPLE_FMT_S32,
@@ -33,7 +33,7 @@ static const enum AVSampleFormat ff_packed_sample_fmts[] = {
     AV_SAMPLE_FMT_NONE
 };
 
-static const enum AVSampleFormat ff_planar_sample_fmts[] = {
+static const enum AVSampleFormat ff_planar_sample_fmts_array[] = {
     AV_SAMPLE_FMT_U8P,
     AV_SAMPLE_FMT_S16P,
     AV_SAMPLE_FMT_S32P,
@@ -63,12 +63,6 @@ AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
 AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
                                              int nb_samples);
 
-/** default handler for filter_samples() for audio inputs */
-void ff_default_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
-/** filter_samples() handler for filters which simply pass audio along */
-void ff_null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
-
 /**
  * Send a buffer of audio samples to the next filter.
  *
@@ -76,7 +70,17 @@ void ff_null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
  * @param samplesref a reference to the buffer of audio samples being sent. The
  *                   receiving filter will free this reference when it no longer
  *                   needs it or pass it on to the next filter.
+ *
+ * @return >= 0 on success, a negative AVERROR on error. The receiving filter
+ * is responsible for unreferencing samplesref in case of error.
+ */
+int ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
+
+/**
+ * Send a buffer of audio samples to the next link, without checking
+ * min_samples.
  */
-void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
+int ff_filter_samples_framed(AVFilterLink *link,
+                              AVFilterBufferRef *samplesref);
 
 #endif /* AVFILTER_AUDIO_H */