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/af_join.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/af_join.c')
-rw-r--r-- | libavfilter/af_join.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 5e338f0efb..210c844524 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -484,6 +484,16 @@ fail: return AVERROR(ENOMEM); } +static const AVFilterPad avfilter_af_join_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .config_props = join_config_output, + .request_frame = join_request_frame, + }, + { NULL } +}; + AVFilter avfilter_af_join = { .name = "join", .description = NULL_IF_CONFIG_SMALL("Join multiple audio streams into " @@ -495,10 +505,6 @@ AVFilter avfilter_af_join = { .query_formats = join_query_formats, .inputs = NULL, - .outputs = (const AVFilterPad[]){{ .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .config_props = join_config_output, - .request_frame = join_request_frame, }, - { NULL }}, + .outputs = avfilter_af_join_outputs, .priv_class = &join_class, }; |