summaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amix.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
|\
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-281-1/+1
* | avfilter: various cosmeticsPaul B Mahol2013-09-121-11/+8
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
* | Merge commit '093804a93cc5da3f95f98265a5df116912443cec'Michael Niedermayer2013-05-051-2/+3
|\ \ | |/
| * avfilter: Add av_cold attributes to init/uninit functionsDiego Biurrun2013-05-041-2/+3
* | Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'Michael Niedermayer2013-04-121-0/+2
|\ \ | |/
| * lavfi: mark filters with dynamic number of inputs or outputs with special flagsAnton Khirnov2013-04-111-0/+2
| * lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-091-1/+1
* | lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-121-1/+1
* | Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'Michael Niedermayer2013-04-111-9/+2
|\ \ | |/
| * af_amix: switch to an AVOptions-based system.Anton Khirnov2013-04-091-10/+2
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-9/+9
|\ \ | |/
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-081-9/+9
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-281-3/+3
* | lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-281-3/+3
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-1/+1
|\ \ | |/
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-111-1/+1
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-5/+11
|\ \ | |/
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-101-5/+11
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-101-1/+3
|\ \ | |/
| * af_amix: prevent memory leak on error pathJanne Grunau2012-10-091-1/+3
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-181-1/+1
|\ \ | |/
| * lavfi: replace empty input/output lists with null pointersMans Rullgard2012-09-171-1/+1
* | Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'Michael Niedermayer2012-09-051-1/+1
|\ \ | |/
| * avopt: Explicitly store float/double option defaults in .dblMartin Storsjö2012-09-041-1/+1
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-2/+2
|\ \ | |/
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-2/+2
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-051-3/+3
|\ \ | |/
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-041-3/+3
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-181-6/+8
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
* | Remove "Error parsing options string [...]" messages.Clément Bœsch2012-08-091-3/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-091-9/+13
|\ \ | |/
| * lavfi: add error handling to filter_samples().Anton Khirnov2012-07-091-9/+13
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-071-4/+6
|\ \ | |/
| * af_amix: avoid spurious EAGAIN.Anton Khirnov2012-07-061-0/+2
| * af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.Anton Khirnov2012-07-061-2/+2
| * af_amix: only consider negative return codes as errors.Anton Khirnov2012-07-061-2/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-271-1/+1
|\ \ | |/
| * amix: fix format specifier for AVFilterLink.sample_rate.Anton Khirnov2012-06-261-1/+1
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-261-1/+1
|\ \ | |/
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-261-1/+1
* | lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-221-9/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-191-11/+19
|\ \ | |/
| * af_amix: allow float planar sample format as inputJustin Ruggles2012-06-181-4/+15
| * af_amix: use AVFloatDSPContext.vector_fmac_scalar()Justin Ruggles2012-06-181-11/+8
* | lavfi: use designated initializers for AVClassPaul B Mahol2012-06-171-1/+2
|/
* lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputsAnton Khirnov2012-06-131-3/+3
OpenPOWER on IntegriCloud