diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:41:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:46:48 +0200 |
commit | 526cb36e4b23d2aae14bba0d19947137ee94f263 (patch) | |
tree | 5929c96c8c1bc7b58cfd665d78806d7208fa00da /libavfilter/vf_overlay.c | |
parent | a75dd13b1bc2132f58bb438e6ca2935677191885 (diff) | |
parent | 4436f25a1682ada3f7226cb6fadf429946933161 (diff) | |
download | ffmpeg-streaming-526cb36e4b23d2aae14bba0d19947137ee94f263.zip ffmpeg-streaming-526cb36e4b23d2aae14bba0d19947137ee94f263.tar.gz |
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
-rw-r--r-- | libavfilter/vf_overlay.c | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index b44c9f2..e4f243f 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -607,6 +607,40 @@ static int null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) return 0; } +static const AVFilterPad avfilter_vf_overlay_inputs[] = { + { + .name = "main", + .type = AVMEDIA_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, + .config_props = config_input_main, + .start_frame = start_frame_main, + .draw_slice = draw_slice_main, + .end_frame = end_frame_main, + .min_perms = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE, + }, + { + .name = "overlay", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input_overlay, + .start_frame = start_frame_over, + .draw_slice = null_draw_slice, + .end_frame = end_frame_over, + .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, + }, + { NULL } +}; + +static const AVFilterPad avfilter_vf_overlay_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .rej_perms = AV_PERM_WRITE, + .config_props = config_output, + .request_frame = request_frame, + }, + { NULL } +}; + AVFilter avfilter_vf_overlay = { .name = "overlay", .description = NULL_IF_CONFIG_SMALL("Overlay a video source on top of the input."), @@ -618,27 +652,7 @@ AVFilter avfilter_vf_overlay = { .query_formats = query_formats, - .inputs = (const AVFilterPad[]) {{ .name = "main", - .type = AVMEDIA_TYPE_VIDEO, - .get_video_buffer= get_video_buffer, - .config_props = config_input_main, - .start_frame = start_frame_main, - .draw_slice = draw_slice_main, - .end_frame = end_frame_main, - .min_perms = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE }, - { .name = "overlay", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_input_overlay, - .start_frame = start_frame_over, - .draw_slice = null_draw_slice, - .end_frame = end_frame_over, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE }, - { .name = NULL}}, - .outputs = (const AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .rej_perms = AV_PERM_WRITE, - .config_props = config_output, - .request_frame = request_frame, }, - { .name = NULL}}, + .inputs = avfilter_vf_overlay_inputs, + .outputs = avfilter_vf_overlay_outputs, .priv_class = &overlay_class, }; |