diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 17:41:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 17:46:48 +0400 |
commit | 526cb36e4b23d2aae14bba0d19947137ee94f263 (patch) | |
tree | 5929c96c8c1bc7b58cfd665d78806d7208fa00da /libavfilter/buffersink.c | |
parent | a75dd13b1bc2132f58bb438e6ca2935677191885 (diff) | |
parent | 4436f25a1682ada3f7226cb6fadf429946933161 (diff) |
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/buffersink.c')
-rw-r--r-- | libavfilter/buffersink.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 5cd0924666..9a9aaf1d38 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -140,6 +140,17 @@ int ff_buffersink_read_samples_compat(AVFilterContext *ctx, AVFilterBufferRef ** return ret; } +static const AVFilterPad avfilter_vsink_buffer_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .start_frame = start_frame, + .min_perms = AV_PERM_READ, + .needs_fifo = 1 + }, + { NULL } +}; + AVFilter avfilter_vsink_buffer = { #if AV_HAVE_INCOMPATIBLE_FORK_ABI .name = "buffersink", @@ -150,15 +161,21 @@ AVFilter avfilter_vsink_buffer = { .priv_size = sizeof(BufferSinkContext), .uninit = uninit, - .inputs = (const AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .start_frame = start_frame, - .min_perms = AV_PERM_READ, - .needs_fifo = 1 }, - { .name = NULL }}, + .inputs = avfilter_vsink_buffer_inputs, .outputs = NULL, }; +static const AVFilterPad avfilter_asink_abuffer_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_samples = start_frame, + .min_perms = AV_PERM_READ, + .needs_fifo = 1 + }, + { NULL } +}; + AVFilter avfilter_asink_abuffer = { #if AV_HAVE_INCOMPATIBLE_FORK_ABI .name = "abuffersink", @@ -169,11 +186,6 @@ AVFilter avfilter_asink_abuffer = { .priv_size = sizeof(BufferSinkContext), .uninit = uninit, - .inputs = (const AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .filter_samples = start_frame, - .min_perms = AV_PERM_READ, - .needs_fifo = 1 }, - { .name = NULL }}, + .inputs = avfilter_asink_abuffer_inputs, .outputs = NULL, }; |