summaryrefslogtreecommitdiffstats
path: root/libavfilter/af_join.c
Commit message (Expand)AuthorAgeFilesLines
* libavfilter/af_join: avoid derreferencing possible nullReynaldo H. Verdejo Pinochet2014-09-261-3/+6
* Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'Michael Niedermayer2014-08-021-1/+1
|\
| * af_join: Set the output frame formatLuca Barbato2014-08-021-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
|\ \ | |/
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-281-1/+1
* | avfilter/af_join: remove now unnecessary gotoPaul B Mahol2013-10-081-10/+5
* | avfilter: various cosmeticsPaul B Mahol2013-09-121-8/+4
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
* | lavfi/join: make use of AVFILTER_DEFINE_CLASSPaul B Mahol2013-05-271-6/+1
* | Merge commit '093804a93cc5da3f95f98265a5df116912443cec'Michael Niedermayer2013-05-051-2/+2
|\ \ | |/
| * avfilter: Add av_cold attributes to init/uninit functionsDiego Biurrun2013-05-041-2/+2
* | lavfi: add missing periods in filter descriptions.Clément Bœsch2013-04-141-1/+1
* | Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'Michael Niedermayer2013-04-121-0/+2
|\ \ | |/
| * lavfi: mark filters with dynamic number of inputs or outputs with special flagsAnton Khirnov2013-04-111-0/+2
| * lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-091-1/+1
* | lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-121-1/+1
* | Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'Michael Niedermayer2013-04-111-7/+11
|\ \ | |/
| * af_join: switch to an AVOptions-based system.Anton Khirnov2013-04-091-8/+11
* | af_join: fix channel count and formatMichael Niedermayer2013-03-281-0/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-161-1/+2
|\ \ | |/
| * af_join: do not leak input frames.Anton Khirnov2013-03-161-1/+2
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-70/+81
|\ \ | |/
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-081-70/+81
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-281-3/+3
* | lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-281-3/+3
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-1/+1
|\ \ | |/
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-111-1/+1
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-5/+11
|\ \ | |/
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-101-5/+11
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-181-1/+1
|\ \ | |/
| * lavfi: replace empty input/output lists with null pointersMans Rullgard2012-09-171-1/+1
* | 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