Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'

[ffmpeg] / libavfilter / internal.h

diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index f7df6d3b41588ad7fc10a6e9384e5f806a429cac..90b4bf4c2184a76d1344798f2bc85a6a70d589f4 100644 (file)
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -24,10 +24,12 @@
  * internal API functions
  */
 
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 #include "formats.h"
 #include "thread.h"
+#include "version.h"
 #include "video.h"
 
 #define POOL_SIZE 32
@@ -153,8 +155,10 @@ struct AVFilterInternal {
                    int *ret, int nb_jobs);
 };
 
+#if FF_API_AVFILTERBUFFER
 /** default handler for freeing audio/video buffer when there are no references left */
 void ff_avfilter_default_free_buffer(AVFilterBuffer *buf);
+#endif
 
 /** Tell is a format is contained in the provided list terminated by -1. */
 int ff_fmt_is_in(int fmt, const int *fmts);
@@ -269,7 +273,9 @@ static inline void ff_insert_inpad(AVFilterContext *f, unsigned index,
     ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
                   &f->input_pads, &f->inputs, p);
 #if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
     f->input_count = f->nb_inputs;
+FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 }
 
@@ -280,7 +286,9 @@ static inline void ff_insert_outpad(AVFilterContext *f, unsigned index,
     ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
                   &f->output_pads, &f->outputs, p);
 #if FF_API_FOO_COUNT
+FF_DISABLE_DEPRECATION_WARNINGS
     f->output_count = f->nb_outputs;
+FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 }