diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-11-03 22:15:52 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-11-03 22:15:52 +0000 |
| commit | da23d4247658d26d8f5d2fa570dfdffea55496fe (patch) | |
| tree | 92ca0fa56b1711316fd3dcf89d0617a4e389d771 | |
| parent | ae2abc69db54552dd6b687ad170ce3cb57882617 (diff) | |
| download | ffmpeg-da23d4247658d26d8f5d2fa570dfdffea55496fe.tar.gz | |
Make avfilter_get_video_buffer() use
avfilter_default_get_video_buffer() if the get_video_buffer() callback
is not defined in a filter.
Libavfilter filters author have to explicitely define the
get_video_buffer() callback if they want the buffer to be requested to
the filter following in the filterchain.
See the thread:
"[FFmpeg-devel] [PATCH] Make avfilter_get_video_buffer() use
default_get_video_buffer if callback not defined".
Originally committed as revision 20444 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavfilter/avfilter.c | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 5e33047262..b7d4cd038a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -188,9 +188,6 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, if(link_dpad(link).get_video_buffer) ret = link_dpad(link).get_video_buffer(link, perms, w, h); - if(!ret && link->dst->output_count) - ret = avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); - if(!ret) ret = avfilter_default_get_video_buffer(link, perms, w, h); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 2b3d1b5a29..7e38110dfb 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -24,7 +24,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 6 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -288,7 +288,7 @@ struct AVFilterPad /** * Callback function to get a buffer. If NULL, the filter system will - * handle buffer requests. + * use avfilter_default_get_video_buffer(). * * Input video pads only. */ |