index
:
ffmpeg-streaming
master
Raptor Engineering's fork of FFmpeg with streaming enhancements https://git.ffmpeg.org/ffmpeg.git
Raptor Engineering, LLC
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
libavfilter
/
af_amerge.c
Commit message (
Expand
)
Author
Age
Files
Lines
*
avfilter/af_amerge: properly handle unknown input layouts
Marton Balint
2016-12-25
1
-3
/
+8
*
avfilter/af_amerge: detect EOF immediately
Nicolas George
2016-12-23
1
-1
/
+6
*
avfilter/af_amerge: allow merging 1 input only
Marton Balint
2016-09-13
1
-1
/
+1
*
avfilter/all: propagate errors of functions from avfilter/formats
Ganesh Ajjanagadde
2015-10-14
1
-8
/
+13
*
avfilter/af_amerge: avoid undefined shift (<<64) in outlayout setup
Michael Niedermayer
2015-09-05
1
-2
/
+2
*
avfilter/af_amerge: use the name 's' for the pointer to the private context
Ganesh Ajjanagadde
2015-08-27
1
-53
/
+53
*
avfilter/af_amerge: increase max number of channels from 32 to 64
Paul B Mahol
2015-07-20
1
-1
/
+1
*
libavfilter/af_amerge: Do not depend on SWR_CH_MAX
Michael Niedermayer
2014-08-10
1
-1
/
+2
*
lavfi/af_amerge: use av_make_q.
Nicolas George
2014-01-19
1
-1
/
+1
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2013-10-29
1
-1
/
+1
*
avfilter: various cosmetics
Paul B Mahol
2013-09-12
1
-1
/
+1
*
lavfi: flag more dynamic i/o filters.
Clément Bœsch
2013-04-13
1
-0
/
+1
*
lavfi: remove now unused args parameter from AVFilter.init and init_opaque
Michael Niedermayer
2013-04-12
1
-1
/
+1
*
lavfi/amerge: switch to an AVOptions-based system.
Clément Bœsch
2013-04-11
1
-8
/
+1
*
lavfi/amerge: drop duplicated "Buffer queue overflow" message
Stefano Sabatini
2013-04-10
1
-1
/
+0
*
lavfi: always check return value of ff_get_{audio,video}_buffer()
Paul B Mahol
2013-04-08
1
-0
/
+2
*
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
Nicolas George
2013-03-24
1
-2
/
+2
*
avfilter: avoid direct access to AVFrame.channels
Michael Niedermayer
2013-03-15
1
-1
/
+1
*
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'
Michael Niedermayer
2013-03-10
1
-14
/
+14
*
libavfilter/af_amerge: fix segfault if init fails.
Nicolas George
2013-02-24
1
-2
/
+4
*
lavfi/amerge: make description consistent with documentation
Paul B Mahol
2013-02-11
1
-1
/
+1
*
lavfi/af_amerge: set outbuf->audio->channels.
Nicolas George
2013-01-31
1
-0
/
+1
*
lavfi/af_amerge: check for buffer queue overflows.
Nicolas George
2013-01-31
1
-0
/
+5
*
lavfi: convert remaining input/output list compound literals to named objects.
Clément Bœsch
2012-11-28
1
-10
/
+13
*
lavfi: replace filter_samples by filter_frame
Michael Niedermayer
2012-11-28
1
-3
/
+3
*
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
Paul B Mahol
2012-11-13
1
-1
/
+1
*
lavfi/amerge: clarify the error message in case of input overlap
Stefano Sabatini
2012-09-11
1
-1
/
+2
*
lavfi/amerge: avoid a forward declaration.
Clément Bœsch
2012-09-11
1
-2
/
+2
*
lavfi/amerge: fix input pad name behaviour.
Clément Bœsch
2012-09-11
1
-3
/
+7
*
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
Michael Niedermayer
2012-09-05
1
-1
/
+1
*
lavfi: add priv class to filter definitions and flags to filter internal options
Stefano Sabatini
2012-08-18
1
-1
/
+3
*
amerge/astreamsync/pan: fix license boilerplate.
Nicolas George
2012-08-03
1
-1
/
+1
*
lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts
William Yu
2012-07-26
1
-1
/
+1
*
lavfi: decrease logging level of message showing initial parameters
Stefano Sabatini
2012-07-15
1
-1
/
+1
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2012-07-09
1
-3
/
+3
*
lavfi/amerge: silence warnings
Paul B Mahol
2012-06-28
1
-1
/
+1
*
Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'
Michael Niedermayer
2012-06-26
1
-1
/
+1
*
lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h
Stefano Sabatini
2012-06-25
1
-0
/
+1
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2012-06-24
1
-1
/
+1
*
lavfi: define macro AVFILTER_DEFINE_CLASS
Stefano Sabatini
2012-06-22
1
-7
/
+1
*
lavfi: use designated initializers for AVClass
Paul B Mahol
2012-06-17
1
-1
/
+3
*
lavfi: update some deprecated functions
Paul B Mahol
2012-06-16
1
-3
/
+3
*
lavfi: af_amerge options array was not ended with NULL
William Yu
2012-06-15
1
-0
/
+1
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2012-06-13
1
-1
/
+1
*
amerge: accept multiple inputs.
Nicolas George
2012-06-07
1
-58
/
+115
*
af_amerge: move nb_in_ch into the in structure.
Nicolas George
2012-06-07
1
-19
/
+19
*
af_amerge: use the buferqueue API.
Nicolas George
2012-06-03
1
-52
/
+34
*
af_amerge: compute output timestamp.
Nicolas George
2012-05-23
1
-0
/
+5
*
af_amerge: set samples rate in query_formats.
Nicolas George
2012-05-23
1
-0
/
+1
*
lavfi: drop planar/packed negotiation support
Stefano Sabatini
2012-05-16
1
-5
/
+1
[next]