aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
Commit message (Expand)AuthorAgeFilesLines
* lavfi/af_amerge: use av_make_q.Nicolas George2014-01-191-1/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
* avfilter: various cosmeticsPaul B Mahol2013-09-121-1/+1
* lavfi: flag more dynamic i/o filters.Clément Bœsch2013-04-131-0/+1
* lavfi: remove now unused args parameter from AVFilter.init and init_opaqueMichael Niedermayer2013-04-121-1/+1
* lavfi/amerge: switch to an AVOptions-based system.Clément Bœsch2013-04-111-8/+1
* lavfi/amerge: drop duplicated "Buffer queue overflow" messageStefano Sabatini2013-04-101-1/+0
* lavfi: always check return value of ff_get_{audio,video}_buffer()Paul B Mahol2013-04-081-0/+2
* lavfi/af_amerge: return EAGAIN if the input layouts are not known.Nicolas George2013-03-241-2/+2
* avfilter: avoid direct access to AVFrame.channelsMichael Niedermayer2013-03-151-1/+1
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-14/+14
* libavfilter/af_amerge: fix segfault if init fails.Nicolas George2013-02-241-2/+4
* lavfi/amerge: make description consistent with documentationPaul B Mahol2013-02-111-1/+1
* lavfi/af_amerge: set outbuf->audio->channels.Nicolas George2013-01-311-0/+1
* lavfi/af_amerge: check for buffer queue overflows.Nicolas George2013-01-311-0/+5
* lavfi: convert remaining input/output list compound literals to named objects.Clément Bœsch2012-11-281-10/+13
* lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-281-3/+3
* Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol2012-11-131-1/+1
* lavfi/amerge: clarify the error message in case of input overlapStefano Sabatini2012-09-111-1/+2
* lavfi/amerge: avoid a forward declaration.Clément Bœsch2012-09-111-2/+2
* lavfi/amerge: fix input pad name behaviour.Clément Bœsch2012-09-111-3/+7
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
* lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-181-1/+3
* amerge/astreamsync/pan: fix license boilerplate.Nicolas George2012-08-031-1/+1
* lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output ptsWilliam Yu2012-07-261-1/+1
* lavfi: decrease logging level of message showing initial parametersStefano Sabatini2012-07-151-1/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-091-3/+3
* lavfi/amerge: silence warningsPaul B Mahol2012-06-281-1/+1
* Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-261-1/+1
* 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