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/asrc_aevalsrc.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/asrc_aevalsrc.c')
| -rw-r--r-- | libavfilter/asrc_aevalsrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c index 4abcbc46aa..94197b2fd8 100644 --- a/libavfilter/asrc_aevalsrc.c +++ b/libavfilter/asrc_aevalsrc.c @@ -190,7 +190,7 @@ static int query_formats(AVFilterContext *ctx) int packing_fmts[] = { AVFILTER_PLANAR, -1 }; avfilter_set_common_sample_formats (ctx, avfilter_make_format_list(sample_fmts)); - avfilter_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts)); + ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts)); avfilter_set_common_packing_formats(ctx, avfilter_make_format_list(packing_fmts)); return 0; |