History

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

Stefano Sabatini committed 17 years ago

Commit da23d421 parent ae2abc62 files · +2 −5Browse files

Unified · Split

2 files
  1. libavfilter/avfilter.c +0 −3
  2. libavfilter/avfilter.h +2 −2
libavfilter/avfilter.c+0−3
@@ -188,9 +188,6 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, · 187 unmodified lines
188 if(link_dpad(link).get_video_buffer)188 if(link_dpad(link).get_video_buffer)
189 ret = link_dpad(link).get_video_buffer(link, perms, w, h);189 ret = link_dpad(link).get_video_buffer(link, perms, w, h);
190 190
191 if(!ret && link->dst->output_count)
192 ret = avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
193
194 if(!ret)191 if(!ret)
195 ret = avfilter_default_get_video_buffer(link, perms, w, h);192 ret = avfilter_default_get_video_buffer(link, perms, w, h);
196 193
libavfilter/avfilter.h+2−2
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 24
25#define LIBAVFILTER_VERSION_MAJOR 125#define LIBAVFILTER_VERSION_MAJOR 1
26#define LIBAVFILTER_VERSION_MINOR 626#define LIBAVFILTER_VERSION_MINOR 6
27#define LIBAVFILTER_VERSION_MICRO 027#define LIBAVFILTER_VERSION_MICRO 1
28 28
29#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \29#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
30 LIBAVFILTER_VERSION_MINOR, \30 LIBAVFILTER_VERSION_MINOR, \
@@ -288,7 +288,7 @@ struct AVFilterPad · 257 unmodified lines
288 288
289 /**289 /**
290 * Callback function to get a buffer. If NULL, the filter system will290 * Callback function to get a buffer. If NULL, the filter system will
291 * handle buffer requests.291 * use avfilter_default_get_video_buffer().
292 *292 *
293 * Input video pads only.293 * Input video pads only.
294 */294 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t