mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
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
This commit is contained in:
parent
ae2abc69db
commit
da23d42476
@ -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);
|
||||
|
||||
|
@ -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.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user