[FFmpeg-cvslog] lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()

Stefano Sabatini git at videolan.org
Sat Dec 15 13:52:55 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Dec 15 13:44:06 2012 +0100| [3d1e2ada2574f89d8475ea9b0249ec861a888edf] | committer: Stefano Sabatini

lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()

Simplify.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d1e2ada2574f89d8475ea9b0249ec861a888edf
---

 libavfilter/vf_overlay.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index d61d18e..01a829c 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -284,11 +284,6 @@ static int config_output(AVFilterLink *outlink)
     return 0;
 }
 
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h)
-{
-    return ff_get_video_buffer(link->dst->outputs[0], perms, w, h);
-}
-
 // divide by 255 and round to nearest
 // apply a fast variant: (X+127)/255 = ((X+127)*257+257)>>16 = ((X+128)*257)>>16
 #define FAST_DIV255(x) ((((x) + 128) * 257) >> 16)
@@ -661,7 +656,7 @@ static const AVFilterPad avfilter_vf_overlay_inputs[] = {
     {
         .name         = "main",
         .type         = AVMEDIA_TYPE_VIDEO,
-        .get_video_buffer= get_video_buffer,
+        .get_video_buffer = ff_null_get_video_buffer,
         .config_props = config_input_main,
         .start_frame  = start_frame_main,
         .draw_slice   = draw_slice_main,



More information about the ffmpeg-cvslog mailing list