* qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak
Showing the changes to libavfilter/src_buffer.c (1 of 52 files). Show all
Unified · Split
| @@ -507,14 +507,15 @@ static int query_formats_audio(AVFilterContext *ctx) · 506 unmodified lines | ||
| 507 | 507 | { |
| 508 | 508 | BufferSourceContext *abuffer = ctx->priv; |
| 509 | 509 | AVFilterFormats *formats; |
| 510 | + AVFilterChannelLayouts *layouts; | |
| 510 | 511 | |
| 511 | 512 | formats = NULL; |
| 512 | 513 | avfilter_add_format(&formats, abuffer->sample_format); |
| 513 | 514 | avfilter_set_common_sample_formats(ctx, formats); |
| 514 | 515 | |
| 515 | − formats = NULL; | |
| 516 | − avfilter_add_format(&formats, abuffer->channel_layout); | |
| 517 | − avfilter_set_common_channel_layouts(ctx, formats); | |
| 516 | + layouts = NULL; | |
| 517 | + ff_add_channel_layout(&layouts, abuffer->channel_layout); | |
| 518 | + ff_set_common_channel_layouts(ctx, layouts); | |
| 518 | 519 | |
| 519 | 520 | formats = NULL; |
| 520 | 521 | avfilter_add_format(&formats, abuffer->packing_format); |
| @@ -653,8 +654,6 @@ AVFilter avfilter_vsrc_buffer = { · 132 unmodified lines | ||
| 653 | 654 | { .name = NULL}}, |
| 654 | 655 | }; |
| 655 | 656 | |
| 656 | −#if CONFIG_ABUFFER_FILTER | |
| 657 | − | |
| 658 | 657 | AVFilter avfilter_asrc_abuffer = { |
| 659 | 658 | .name = "abuffer", |
| 660 | 659 | .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."), |
| @@ -673,4 +672,3 @@ AVFilter avfilter_asrc_abuffer = { · 12 unmodified lines | ||
| 673 | 672 | { .name = NULL}}, |
| 674 | 673 | }; |
| 675 | 674 | |
| 676 | −#endif | |