* 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
Showing the changes to libavfilter/split.c (1 of 60 files). Show all
Unified · Split
| @@ -119,6 +119,18 @@ static int end_frame(AVFilterLink *inlink) · 118 unmodified lines | ||
| 119 | 119 | return ret; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | +static const AVFilterPad avfilter_vf_split_inputs[] = { | |
| 123 | + { | |
| 124 | + .name = "default", | |
| 125 | + .type = AVMEDIA_TYPE_VIDEO, | |
| 126 | + .get_video_buffer = ff_null_get_video_buffer, | |
| 127 | + .start_frame = start_frame, | |
| 128 | + .draw_slice = draw_slice, | |
| 129 | + .end_frame = end_frame, | |
| 130 | + }, | |
| 131 | + { NULL } | |
| 132 | +}; | |
| 133 | + | |
| 122 | 134 | AVFilter avfilter_vf_split = { |
| 123 | 135 | .name = "split", |
| 124 | 136 | .description = NULL_IF_CONFIG_SMALL("Pass on the input video to N outputs."), |
| @@ -126,13 +138,7 @@ AVFilter avfilter_vf_split = { · 1 unmodified line | ||
| 126 | 138 | .init = split_init, |
| 127 | 139 | .uninit = split_uninit, |
| 128 | 140 | |
| 129 | − .inputs = (const AVFilterPad[]) {{ .name = "default", | |
| 130 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 131 | − .get_video_buffer= ff_null_get_video_buffer, | |
| 132 | − .start_frame = start_frame, | |
| 133 | − .draw_slice = draw_slice, | |
| 134 | − .end_frame = end_frame, }, | |
| 135 | − { .name = NULL}}, | |
| 141 | + .inputs = avfilter_vf_split_inputs, | |
| 136 | 142 | .outputs = NULL, |
| 137 | 143 | }; |
| 138 | 144 | |
| @@ -157,6 +163,16 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) · 18 unmodified lines | ||
| 157 | 163 | return ret; |
| 158 | 164 | } |
| 159 | 165 | |
| 166 | +static const AVFilterPad avfilter_af_asplit_inputs[] = { | |
| 167 | + { | |
| 168 | + .name = "default", | |
| 169 | + .type = AVMEDIA_TYPE_AUDIO, | |
| 170 | + .get_audio_buffer = ff_null_get_audio_buffer, | |
| 171 | + .filter_samples = filter_samples | |
| 172 | + }, | |
| 173 | + { NULL } | |
| 174 | +}; | |
| 175 | + | |
| 160 | 176 | AVFilter avfilter_af_asplit = { |
| 161 | 177 | .name = "asplit", |
| 162 | 178 | .description = NULL_IF_CONFIG_SMALL("Pass on the audio input to N audio outputs."), |
| @@ -164,10 +180,6 @@ AVFilter avfilter_af_asplit = { · 1 unmodified line | ||
| 164 | 180 | .init = split_init, |
| 165 | 181 | .uninit = split_uninit, |
| 166 | 182 | |
| 167 | − .inputs = (const AVFilterPad[]) {{ .name = "default", | |
| 168 | − .type = AVMEDIA_TYPE_AUDIO, | |
| 169 | − .get_audio_buffer = ff_null_get_audio_buffer, | |
| 170 | − .filter_samples = filter_samples }, | |
| 171 | − { .name = NULL }}, | |
| 183 | + .inputs = avfilter_af_asplit_inputs, | |
| 172 | 184 | .outputs = NULL, |
| 173 | 185 | }; |