summaryrefslogtreecommitdiff
path: root/libavfilter/af_amix.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
* | Remove "Error parsing options string [...]" messages.Clément Bœsch2012-08-09
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-09
|\|
| * lavfi: add error handling to filter_samples().Anton Khirnov2012-07-09
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-07
|\|
| * af_amix: avoid spurious EAGAIN.Anton Khirnov2012-07-06
| * af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.Anton Khirnov2012-07-06
| * af_amix: only consider negative return codes as errors.Anton Khirnov2012-07-06
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-27
|\|
| * amix: fix format specifier for AVFilterLink.sample_rate.Anton Khirnov2012-06-26
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-26
|\|
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-26
* | lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-22
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-19
|\|
| * af_amix: allow float planar sample format as inputJustin Ruggles2012-06-18
| * af_amix: use AVFloatDSPContext.vector_fmac_scalar()Justin Ruggles2012-06-18
* | lavfi: use designated initializers for AVClassPaul B Mahol2012-06-17
|/
* lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputsAnton Khirnov2012-06-13
* lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov2012-06-05
* lavfi: make avfilter_insert_pad and pals private on next bump.Anton Khirnov2012-06-05
* lavfi: make formats API private on next bump.Anton Khirnov2012-06-05
* lavfi: amix: check active input count before calling request_samplesJustin Ruggles2012-05-30
* lavfi: add audio mix filterJustin Ruggles2012-05-23