diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:36:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:36:54 +0200 |
| commit | 0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4 (patch) | |
| tree | 1e724f0eea3edc4eb06880d8e272c2b017d209fa /libavfilter/buffer.c | |
| parent | b32643813961d7d76e9040c13d88c3a7cd6f923d (diff) | |
| parent | 45dd1ae1b3c18331f3db2293a9135bc5851e553f (diff) | |
Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f'
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs
Conflicts:
libavfilter/buffer.c
libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffer.c')
| -rw-r--r-- | libavfilter/buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c index 29fedc4126..1bbfab8024 100644 --- a/libavfilter/buffer.c +++ b/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 */ |