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
*
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
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2012-05-16
1
-10
/
+11
*
lavfi: remove audio.h include from avfilter.h.
Clément Bœsch
2012-05-12
1
-0
/
+1
*
Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
2012-05-10
1
-2
/
+2
*
af_amerge: return errors from subfilters when requesting a frame
Matthieu Bouron
2012-04-26
1
-2
/
+3
*
lavfi/amerge: copy ref props after filtering samples.
Clément Bœsch
2012-02-02
1
-0
/
+7
*
lavfi: add amerge audio filter.
Nicolas George
2011-12-31
1
-0
/
+288