summaryrefslogtreecommitdiff
path: root/libavfilter/af_amerge.c
Commit message (Expand)AuthorAge
* 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