Merge commit '45dd1ae1'

* commit '45dd1ae1':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/buffer.c

@@ -30,7 +30,9 @@
 #include "internal.h"
 #include "audio.h"
 #include "avcodec.h"
+#include "version.h"
 
+#if FF_API_AVFILTERBUFFER
 void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr)
 {
     if (ptr->extended_data != ptr->data)
@@ -165,3 +167,4 @@ void avfilter_copy_buffer_ref_props(AVFilterBufferRef *dst, AVFilterBufferRef *s
     av_dict_free(&dst->metadata);
     av_dict_copy(&dst->metadata, src->metadata, 0);
 }
+#endif /* FF_API_AVFILTERBUFFER */

libavfilter/internal.h

@@ -28,6 +28,7 @@
 #include "avfiltergraph.h"
 #include "formats.h"
 #include "thread.h"
+#include "version.h"
 #include "video.h"
 
 #define POOL_SIZE 32
@@ -153,8 +154,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);