[FFmpeg-soc] [soc]: r5717 - libavfilter/vf_overlay.c
stefano
subversion at mplayerhq.hu
Thu Mar 25 00:25:00 CET 2010
Author: stefano
Date: Thu Mar 25 00:25:00 2010
New Revision: 5717
Log:
Only draw_slice in request_frame(), thus do not propagate the
draw_slice() request coming from the input filters before
avfilter_start_frame() is called, fix crash.
Modified:
libavfilter/vf_overlay.c
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Wed Mar 24 18:05:51 2010 (r5716)
+++ libavfilter/vf_overlay.c Thu Mar 25 00:25:00 2010 (r5717)
@@ -184,6 +184,10 @@ static void start_frame(AVFilterLink *li
}
}
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
+{
+}
+
static void end_frame(AVFilterLink *link)
{
}
@@ -341,6 +345,7 @@ AVFilter avfilter_vf_overlay =
.type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.config_props = config_input_main,
+ .draw_slice = draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_READ,
.rej_perms = AV_PERM_REUSE2, },
@@ -348,6 +353,7 @@ AVFilter avfilter_vf_overlay =
.type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.config_props = config_input_overlay,
+ .draw_slice = draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_READ,
.rej_perms = AV_PERM_REUSE2, },
More information about the FFmpeg-soc
mailing list