lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()
authorStefano Sabatini <stefasab@gmail.com>
Thu, 2 Aug 2012 09:59:57 +0000 (11:59 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Thu, 2 Aug 2012 10:32:48 +0000 (12:32 +0200)
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.

libavfilter/vf_bbox.c
libavfilter/vf_blackdetect.c
libavfilter/vf_blackframe.c
libavfilter/vf_showinfo.c
libavfilter/video.c

index b59d1bc..a3b8a23 100644 (file)
@@ -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 }
index dfd94ef..96165d2 100644 (file)
@@ -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 }
     },
index dc33444..16b2870 100644 (file)
@@ -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}},
 
index 1c65563..fd9ea69 100644 (file)
@@ -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}},
index 95791cd..12dcada 100644 (file)
@@ -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]);