summaryrefslogtreecommitdiffstats
path: root/libavfilter/af_join.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
|\
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-1/+1
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-181-3/+5
* | 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
|/
* lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov2012-07-221-2/+2
* lavfi: add error handling to filter_samples().Anton Khirnov2012-07-091-3/+5
* af_join: initialize a variable to shut up gcc warning.Anton Khirnov2012-06-261-1/+2
* lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-261-1/+1
* lavfi: add join audio filter.Anton Khirnov2012-06-221-0/+500
OpenPOWER on IntegriCloud