* qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c
Showing the changes to libavfilter/avfilter.h (1 of 64 files). Show all
Unified · Split
| @@ -261,8 +261,11 @@ struct AVFilterPad { · 260 unmodified lines | ||
| 261 | 261 | * picture inside the link structure. |
| 262 | 262 | * |
| 263 | 263 | * Input video pads only. |
| 264 | + * | |
| 265 | + * @return >= 0 on success, a negative AVERROR on error. picref will be | |
| 266 | + * unreferenced by the caller in case of error. | |
| 264 | 267 | */ |
| 265 | − void (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref); | |
| 268 | + int (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref); | |
| 266 | 269 | |
| 267 | 270 | /** |
| 268 | 271 | * Callback function to get a video buffer. If NULL, the filter system will |
| @@ -287,16 +290,20 @@ struct AVFilterPad { · 18 unmodified lines | ||
| 287 | 290 | * in the link structure during start_frame(). |
| 288 | 291 | * |
| 289 | 292 | * Input video pads only. |
| 293 | + * | |
| 294 | + * @return >= 0 on success, a negative AVERROR on error. | |
| 290 | 295 | */ |
| 291 | − void (*end_frame)(AVFilterLink *link); | |
| 296 | + int (*end_frame)(AVFilterLink *link); | |
| 292 | 297 | |
| 293 | 298 | /** |
| 294 | 299 | * Slice drawing callback. This is where a filter receives video data |
| 295 | 300 | * and should do its processing. |
| 296 | 301 | * |
| 297 | 302 | * Input video pads only. |
| 303 | + * | |
| 304 | + * @return >= 0 on success, a negative AVERROR on error. | |
| 298 | 305 | */ |
| 299 | − void (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir); | |
| 306 | + int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir); | |
| 300 | 307 | |
| 301 | 308 | /** |
| 302 | 309 | * Samples filtering callback. This is where a filter receives audio data |
| @@ -385,7 +392,7 @@ enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx); · 82 unmodified lines | ||
| 385 | 392 | |
| 386 | 393 | /** default handler for end_frame() for video inputs */ |
| 387 | 394 | attribute_deprecated |
| 388 | −void avfilter_default_end_frame(AVFilterLink *link); | |
| 395 | +int avfilter_default_end_frame(AVFilterLink *link); | |
| 389 | 396 | |
| 390 | 397 | /** |
| 391 | 398 | * Filter definition. This defines the pads a filter contains, and all the |