diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-26 15:52:32 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-28 22:27:05 +0200 |
| commit | b0fdd3489a6f5e63ee494245bb34eccf138b17d3 (patch) | |
| tree | f94d291085a3e4c075eb44f1a327c5f363fbdb97 | |
| parent | cd8bef969ab30b6008387cbffa242bf38a449d9d (diff) | |
| download | ffmpeg-b0fdd3489a6f5e63ee494245bb34eccf138b17d3.tar.gz | |
lavfi: deprecate av_buffersrc_buffer() function
Favor av_buffersrc_add_ref() instead, which is more powerful.
| -rw-r--r-- | ffplay.c | 2 | ||||
| -rw-r--r-- | libavfilter/buffersrc.c | 2 | ||||
| -rw-r--r-- | libavfilter/buffersrc.h | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
4 files changed, 10 insertions, 1 deletions
@@ -1722,7 +1722,7 @@ static int video_thread(void *arg) fb->buf->free = filter_release_buffer; buf->refcount++; - av_buffersrc_buffer(filt_in, fb); + av_buffersrc_add_ref(filt_in, fb, AV_BUFFERSRC_FLAG_NO_COPY); } else av_buffersrc_write_frame(filt_in, frame); diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 3c0d96497b..dd9eb39b59 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -196,10 +196,12 @@ int av_buffersrc_add_ref(AVFilterContext *s, AVFilterBufferRef *buf, int flags) return 0; } +#ifdef FF_API_BUFFERSRC_BUFFER int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf) { return av_buffersrc_add_ref(s, buf, AV_BUFFERSRC_FLAG_NO_COPY); } +#endif unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src) { diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index adfb33022f..a23e48f677 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -63,14 +63,18 @@ int av_buffersrc_add_ref(AVFilterContext *buffer_src, */ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src); +#ifdef FF_API_BUFFERSRC_BUFFER /** * Add a buffer to the filtergraph s. * * @param buf buffer containing frame data to be passed down the filtergraph. * This function will take ownership of buf, the user must not free it. * A NULL buf signals EOF -- i.e. no more frames will be sent to this filter. + * @deprecated Use av_buffersrc_add_ref(s, picref, AV_BUFFERSRC_FLAG_NO_COPY) instead. */ +attribute_deprecated int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); +#endif /** * Add a frame to the buffer source. diff --git a/libavfilter/version.h b/libavfilter/version.h index 124348d41e..c2285cb6e6 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -56,5 +56,8 @@ #ifndef FF_API_FILL_FRAME #define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_BUFFERSRC_BUFFER +#define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif // AVFILTER_VERSION_H |