* qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile
Showing the changes to libavfilter/graphparser.c (1 of 68 files). Show all
Unified · Split
| @@ -226,7 +226,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 225 unmodified lines | |||
| 226 | { | 226 | { |
| 227 | int pad, ret; | 227 | int pad, ret; |
| 228 | 228 | ||
| 229 | for (pad = 0; pad < filt_ctx->input_count; pad++) { | 229 | for (pad = 0; pad < filt_ctx->nb_inputs; pad++) { |
| 230 | AVFilterInOut *p = *curr_inputs; | 230 | AVFilterInOut *p = *curr_inputs; |
| 231 | 231 | ||
| 232 | if (p) { | 232 | if (p) { |
| @@ -254,7 +254,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 21 unmodified lines | |||
| 254 | return AVERROR(EINVAL); | 254 | return AVERROR(EINVAL); |
| 255 | } | 255 | } |
| 256 | 256 | ||
| 257 | pad = filt_ctx->output_count; | 257 | pad = filt_ctx->nb_outputs; |
| 258 | while (pad--) { | 258 | while (pad--) { |
| 259 | AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut)); | 259 | AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut)); |
| 260 | if (!currlinkn) | 260 | if (!currlinkn) |