[FFmpeg-cvslog] lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()
Stefano Sabatini
git at videolan.org
Thu Aug 2 12:46:29 CEST 2012
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Aug 2 11:59:57 2012 +0200| [65520f5933b41f779a161c3896c64e63007b6f38] | committer: Stefano Sabatini
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65520f5933b41f779a161c3896c64e63007b6f38
---
libavfilter/vf_bbox.c | 2 +-
libavfilter/vf_blackdetect.c | 2 +-
libavfilter/vf_blackframe.c | 2 +-
libavfilter/vf_showinfo.c | 2 +-
libavfilter/video.c | 6 ------
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c
index b59d1bc..a3b8a23 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 dfd94ef..96165d2 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 dc33444..16b2870 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 1c65563..fd9ea69 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 95791cd..12dcada 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]);
More information about the ffmpeg-cvslog
mailing list