aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/video.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-27 01:13:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-30 16:58:50 +0100
commitc0c0b19644eb60957294d6cc211c8f91c88afe35 (patch)
tree3fac0983c01fcb075a023083e221257d2d7a7123 /libavfilter/video.c
parent8997a0fa79cc4d20e78fd6f0de40f7127828978a (diff)
downloadffmpeg-c0c0b19644eb60957294d6cc211c8f91c88afe35.tar.gz
lavfi: remove some draw_slice related code that has become unneeded
Reviewed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/video.c')
-rw-r--r--libavfilter/video.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c
index e619db1eb4..a7ef0454a1 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -166,7 +166,7 @@ static int default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
if (inlink->dst->nb_outputs)
outlink = inlink->dst->outputs[0];
- if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice)) {
+ if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame)) {
AVFilterBufferRef *buf_out;
outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
if (!outlink->out_buf)
@@ -283,7 +283,7 @@ static int default_end_frame(AVFilterLink *inlink)
int ret = inlink->dstpad->filter_frame(inlink, inlink->cur_buf);
inlink->cur_buf = NULL;
return ret;
- } else if (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice){
+ } else if (inlink->dstpad->start_frame || inlink->dstpad->end_frame){
return ff_end_frame(outlink);
} else {
int ret = ff_filter_frame(outlink, inlink->cur_buf);
@@ -309,23 +309,10 @@ int ff_end_frame(AVFilterLink *link)
return ret;
}
-static int default_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
-{
- AVFilterLink *outlink = NULL;
-
- if (inlink->dst->nb_outputs)
- outlink = inlink->dst->outputs[0];
-
- if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice))
- return ff_draw_slice(outlink, y, h, slice_dir);
- return 0;
-}
-
int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
uint8_t *src[4], *dst[4];
- int i, j, vsub, ret;
- int (*draw_slice)(AVFilterLink *, int, int, int);
+ int i, j, vsub;
FF_TPRINTF_START(NULL, draw_slice); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir);
@@ -358,14 +345,8 @@ int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
}
}
- if (!(draw_slice = link->dstpad->draw_slice))
- draw_slice = default_draw_slice;
- ret = draw_slice(link, y, h, slice_dir);
- if (ret < 0)
- clear_link(link);
- else
/* incoming buffers must not be freed in start frame,
because they can still be in use by the automatic copy mechanism */
av_assert1(link->cur_buf_copy->buf->refcount > 0);
- return ret;
+ return 0;
}