diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-08-02 11:59:57 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-08-02 12:32:48 +0200 |
| commit | 65520f5933b41f779a161c3896c64e63007b6f38 (patch) | |
| tree | 7f1cbf7f24e08aa7d46c348a854aa5a67d713968 | |
| parent | 8cac86e091118dab5a7463cb6119c940a6b8940c (diff) | |
| download | ffmpeg-65520f5933b41f779a161c3896c64e63007b6f38.tar.gz | |
lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()
Semantic for the function ff_null_start_frame() was changed in
07bad27810cd, and it has now the same behavior of
ff_null_start_frame_keep_ref(), thus it makes no sense to keep both of
them.
| -rw-r--r-- | libavfilter/vf_bbox.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_blackdetect.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_blackframe.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_showinfo.c | 2 | ||||
| -rw-r--r-- | libavfilter/video.c | 6 |
5 files changed, 4 insertions, 10 deletions
diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c index b59d1bc3a8..a3b8a23758 100644 --- a/libavfilter/vf_bbox.c +++ b/libavfilter/vf_bbox.c @@ -100,7 +100,7 @@ AVFilter avfilter_vf_bbox = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame_keep_ref, + .start_frame = ff_null_start_frame, .end_frame = end_frame, .min_perms = AV_PERM_READ, }, { .name = NULL } diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index dfd94efca2..96165d2fcd 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -210,7 +210,7 @@ AVFilter avfilter_vf_blackdetect = { .config_props = config_input, .draw_slice = draw_slice, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame_keep_ref, + .start_frame = ff_null_start_frame, .end_frame = end_frame, }, { .name = NULL } }, diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index dc3344489a..16b2870d5e 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -130,7 +130,7 @@ AVFilter avfilter_vf_blackframe = { .type = AVMEDIA_TYPE_VIDEO, .draw_slice = draw_slice, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame_keep_ref, + .start_frame = ff_null_start_frame, .end_frame = end_frame, }, { .name = NULL}}, diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 1c655636b3..fd9ea69f99 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -94,7 +94,7 @@ AVFilter avfilter_vf_showinfo = { .inputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame_keep_ref, + .start_frame = ff_null_start_frame, .end_frame = end_frame, .min_perms = AV_PERM_READ, }, { .name = NULL}}, diff --git a/libavfilter/video.c b/libavfilter/video.c index 95791cda93..12dcada4bb 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -282,12 +282,6 @@ int ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) return ret; } -int ff_null_start_frame_keep_ref(AVFilterLink *inlink, - AVFilterBufferRef *picref) -{ - return ff_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(picref, ~0)); -} - int ff_null_end_frame(AVFilterLink *link) { return ff_end_frame(link->dst->outputs[0]); |