summaryrefslogtreecommitdiff
path: root/libavfilter/af_join.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
|/
* lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov2012-07-22
* lavfi: add error handling to filter_samples().Anton Khirnov2012-07-09
* af_join: initialize a variable to shut up gcc warning.Anton Khirnov2012-06-26
* lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-26
* lavfi: add join audio filter.Anton Khirnov2012-06-22