Browse Source

lavfi: deprecate av_buffersrc_buffer() function

Favor av_buffersrc_add_ref() instead, which is more powerful.
tags/n1.0
Stefano Sabatini 13 years ago
parent
commit
b0fdd3489a
4 changed files with 10 additions and 1 deletions
  1. +1
    -1
      ffplay.c
  2. +2
    -0
      libavfilter/buffersrc.c
  3. +4
    -0
      libavfilter/buffersrc.h
  4. +3
    -0
      libavfilter/version.h

+ 1
- 1
ffplay.c View File

@@ -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);


+ 2
- 0
libavfilter/buffersrc.c View File

@@ -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)
{


+ 4
- 0
libavfilter/buffersrc.h View File

@@ -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.


+ 3
- 0
libavfilter/version.h View File

@@ -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

Loading…
Cancel
Save