summaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
Commit message (Expand)AuthorAgeFilesLines
* lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.hStefano Sabatini2012-06-251-0/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-241-1/+1
* lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-221-7/+1
* lavfi: use designated initializers for AVClassPaul B Mahol2012-06-171-1/+3
* lavfi: update some deprecated functionsPaul B Mahol2012-06-161-3/+3
* lavfi: af_amerge options array was not ended with NULLWilliam Yu2012-06-151-0/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-131-1/+1
* amerge: accept multiple inputs.Nicolas George2012-06-071-58/+115
* af_amerge: move nb_in_ch into the in structure.Nicolas George2012-06-071-19/+19
* af_amerge: use the buferqueue API.Nicolas George2012-06-031-52/+34
* af_amerge: compute output timestamp.Nicolas George2012-05-231-0/+5
* af_amerge: set samples rate in query_formats.Nicolas George2012-05-231-0/+1
* lavfi: drop planar/packed negotiation supportStefano Sabatini2012-05-161-5/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-161-10/+11
* lavfi: remove audio.h include from avfilter.h.Clément Bœsch2012-05-121-0/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-101-2/+2
* af_amerge: return errors from subfilters when requesting a frameMatthieu Bouron2012-04-261-2/+3
* lavfi/amerge: copy ref props after filtering samples.Clément Bœsch2012-02-021-0/+7
* lavfi: add amerge audio filter.Nicolas George2011-12-311-0/+288
OpenPOWER on IntegriCloud