diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:48:34 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:48:34 +0100 |
| commit | 6375ba827a6d9587b5f62a1ed7482a6ed20718db (patch) | |
| tree | 416ba3e466c541f11712af6d09dc959363ae00cb /libavfilter/af_join.c | |
| parent | 0b73d0ff0df7135332ef77e78b619b0822d248a8 (diff) | |
| parent | 61fb67dcb2e71a268c422fc19d366040e59fb337 (diff) | |
| download | ffmpeg-6375ba827a6d9587b5f62a1ed7482a6ed20718db.tar.gz | |
Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'
* commit '61fb67dcb2e71a268c422fc19d366040e59fb337':
buffersrc: accept the frame rate as argument.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions