diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 02:27:31 +0200 |
commit | 1cbf7fb4345a3e5b7791d483241bf4759bde4ece (patch) | |
tree | d7acd8317309e051fb240e3505f77aabe2ea0437 /libavfilter/af_pan.c | |
parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) | |
download | android_external_ffmpeg-1cbf7fb4345a3e5b7791d483241bf4759bde4ece.tar.gz android_external_ffmpeg-1cbf7fb4345a3e5b7791d483241bf4759bde4ece.tar.bz2 android_external_ffmpeg-1cbf7fb4345a3e5b7791d483241bf4759bde4ece.zip |
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_pan.c')
-rw-r--r-- | libavfilter/af_pan.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index fd65aac58c..3100a14881 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -33,6 +33,7 @@ #include "libswresample/swresample.h" #include "audio.h" #include "avfilter.h" +#include "formats.h" #define MAX_CHANNELS 63 @@ -212,7 +213,7 @@ static int query_formats(AVFilterContext *ctx) PanContext *pan = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; - AVFilterFormats *formats; + AVFilterChannelLayouts *layouts; pan->pure_gains = are_gains_pure(pan); /* libswr supports any sample and packing formats */ @@ -220,13 +221,13 @@ static int query_formats(AVFilterContext *ctx) avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats()); // inlink supports any channel layout - formats = avfilter_make_all_channel_layouts(); - avfilter_formats_ref(formats, &inlink->out_chlayouts); + layouts = ff_all_channel_layouts(); + ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts); // outlink supports only requested output channel layout - formats = NULL; - avfilter_add_format(&formats, pan->out_channel_layout); - avfilter_formats_ref(formats, &outlink->in_chlayouts); + layouts = NULL; + ff_add_channel_layout(&layouts, pan->out_channel_layout); + ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); return 0; } |