diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 04:27:31 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 04:27:31 +0400 |
commit | 1cbf7fb4345a3e5b7791d483241bf4759bde4ece (patch) | |
tree | d7acd8317309e051fb240e3505f77aabe2ea0437 /libavfilter/af_amerge.c | |
parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) |
Merge remote-tracking branch 'qatar/master'
* 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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r-- | libavfilter/af_amerge.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index faa64e1977..fcc1089d6f 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -56,17 +56,18 @@ static int query_formats(AVFilterContext *ctx) int64_t inlayout[2], outlayout; const int packing_fmts[] = { AVFILTER_PACKED, -1 }; AVFilterFormats *formats; + AVFilterChannelLayouts *layouts; int i; for (i = 0; i < 2; i++) { - if (!ctx->inputs[i]->in_chlayouts || - !ctx->inputs[i]->in_chlayouts->format_count) { + if (!ctx->inputs[i]->in_channel_layouts || + !ctx->inputs[i]->in_channel_layouts->nb_channel_layouts) { av_log(ctx, AV_LOG_ERROR, "No channel layout for input %d\n", i + 1); return AVERROR(EINVAL); } - inlayout[i] = ctx->inputs[i]->in_chlayouts->formats[0]; - if (ctx->inputs[i]->in_chlayouts->format_count > 1) { + inlayout[i] = ctx->inputs[i]->in_channel_layouts->channel_layouts[0]; + if (ctx->inputs[i]->in_channel_layouts->nb_channel_layouts > 1) { char buf[256]; av_get_channel_layout_string(buf, sizeof(buf), 0, inlayout[i]); av_log(ctx, AV_LOG_INFO, "Using \"%s\" for input %d\n", buf, i + 1); @@ -101,13 +102,13 @@ static int query_formats(AVFilterContext *ctx) formats = avfilter_make_format_list(packing_fmts); avfilter_set_common_packing_formats(ctx, formats); for (i = 0; i < 2; i++) { - formats = NULL; - avfilter_add_format(&formats, inlayout[i]); - avfilter_formats_ref(formats, &ctx->inputs[i]->out_chlayouts); + layouts = NULL; + ff_add_channel_layout(&layouts, inlayout[i]); + ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts); } - formats = NULL; - avfilter_add_format(&formats, outlayout); - avfilter_formats_ref(formats, &ctx->outputs[0]->in_chlayouts); + layouts = NULL; + ff_add_channel_layout(&layouts, outlayout); + ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts); return 0; } |