lavfi: deprecate av_buffersrc_buffer() function
authorStefano Sabatini <stefasab@gmail.com>
Tue, 26 Jun 2012 13:52:32 +0000 (15:52 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Thu, 28 Jun 2012 20:27:05 +0000 (22:27 +0200)
Favor av_buffersrc_add_ref() instead, which is more powerful.

ffplay.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/version.h

index 492ac46..c4b8f8e 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -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);
index 3c0d964..dd9eb39 100644 (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)
 {
index adfb330..a23e48f 100644 (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.
index 124348d..c2285cb 100644 (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