summaryrefslogtreecommitdiff
path: root/libavfilter/af_amix.c
Commit message (Expand)AuthorAge
* lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-12
* Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'Michael Niedermayer2013-04-11
|\
| * af_amix: switch to an AVOptions-based system.Anton Khirnov2013-04-09
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\|
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-08
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-28
* | lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-28
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\|
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
|\|
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-10
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-10
|\|
| * af_amix: prevent memory leak on error pathJanne Grunau2012-10-09
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-18
|\|
| * lavfi: replace empty input/output lists with null pointersMans Rullgard2012-09-17
* | Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'Michael Niedermayer2012-09-05
|\|
| * avopt: Explicitly store float/double option defaults in .dblMartin Storsjö2012-09-04
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\|
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-05
|\|
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-04
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-18
* | 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