diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:59:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:59:42 +0200 |
| commit | 5e253fdfc1a4e727628243580c1c3d589c1951f1 (patch) | |
| tree | f5dbde1d9a1b2dd15631d3cc15c39d45cf0aa0d8 /libavfilter/vf_drawbox.c | |
| parent | c28bca2bdef6c4671c25b1c0b25c489f11ffad80 (diff) | |
| parent | 628a17d78ac1d95d83482b0c333c03bdb1fffbe9 (diff) | |
| download | ffmpeg-5e253fdfc1a4e727628243580c1c3d589c1951f1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawbox.c')
0 files changed, 0 insertions, 0 deletions