diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-04-25 00:25:18 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-04-27 21:38:13 +0200 |
| commit | 6b55aab01a5c2e4c9f2851fdb9b7583f184b5241 (patch) | |
| tree | f7003f2883ea88506de887a9304ba633f9160dcc /libavfilter/vf_blackframe.c | |
| parent | 6f3b1d7f8643932a4ffc582cc77d8c5fe81b904d (diff) | |
| download | ffmpeg-6b55aab01a5c2e4c9f2851fdb9b7583f184b5241.tar.gz | |
lavfi: create buffer reference in filters which need to access the ref later
Also add internal function ff_null_start_frame_keep_ref().
Fix crash when a following filter (e.g. settb) will unref the reference
passed by start_frame(), and then the reference is accessed in
end_frame() through inlink->cur_buf.
Diffstat (limited to 'libavfilter/vf_blackframe.c')
| -rw-r--r-- | libavfilter/vf_blackframe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index d57092ddf2..7e80fd7e46 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -28,6 +28,7 @@ */ #include "avfilter.h" +#include "internal.h" typedef struct { unsigned int bamount; ///< black amount @@ -110,6 +111,7 @@ static void end_frame(AVFilterLink *inlink) blackframe->frame++; blackframe->nblack = 0; + avfilter_unref_buffer(picref); avfilter_end_frame(inlink->dst->outputs[0]); } @@ -126,7 +128,7 @@ AVFilter avfilter_vf_blackframe = { .type = AVMEDIA_TYPE_VIDEO, .draw_slice = draw_slice, .get_video_buffer = avfilter_null_get_video_buffer, - .start_frame = avfilter_null_start_frame, + .start_frame = ff_null_start_frame_keep_ref, .end_frame = end_frame, }, { .name = NULL}}, |