aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-12-15 13:44:06 +0100
committerStefano Sabatini <stefasab@gmail.com>2012-12-15 13:51:24 +0100
commit3d1e2ada2574f89d8475ea9b0249ec861a888edf (patch)
treed0e0bf2793f2f65022f5edbfb452b9dabff04df9
parent8f44170d307af99d1891a531b2fe6caa28cb8f37 (diff)
downloadffmpeg-3d1e2ada2574f89d8475ea9b0249ec861a888edf.tar.gz
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
Simplify.
-rw-r--r--libavfilter/vf_overlay.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index d61d18e1bb..01a829c828 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,