summaryrefslogtreecommitdiff
path: root/libavfilter/af_amerge.c
Commit message (Expand)AuthorAge
* lavfi: af_amerge options array was not ended with NULLWilliam Yu2012-06-15
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-13
* amerge: accept multiple inputs.Nicolas George2012-06-07
* af_amerge: move nb_in_ch into the in structure.Nicolas George2012-06-07
* af_amerge: use the buferqueue API.Nicolas George2012-06-03
* af_amerge: compute output timestamp.Nicolas George2012-05-23
* af_amerge: set samples rate in query_formats.Nicolas George2012-05-23
* lavfi: drop planar/packed negotiation supportStefano Sabatini2012-05-16
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
* lavfi: remove audio.h include from avfilter.h.Clément Bœsch2012-05-12
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-10
* af_amerge: return errors from subfilters when requesting a frameMatthieu Bouron2012-04-26
* lavfi/amerge: copy ref props after filtering samples.Clément Bœsch2012-02-02
* lavfi: add amerge audio filter.Nicolas George2011-12-31