diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:20:04 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:20:04 +0200 |
| commit | 8dd0e3d50f8488a00fdb59b0794358a0ba334c00 (patch) | |
| tree | bb721082b251e72cb263e82c8871e08617d33bdd /libavformat/hls.c | |
| parent | e8487d71be4dfaa3b9be519936ac74917d956d8a (diff) | |
| parent | 4dbfcd07570a9e45e9597561023adb6da26f27f6 (diff) | |
| download | ffmpeg-8dd0e3d50f8488a00fdb59b0794358a0ba334c00.tar.gz | |
Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'
* commit '4dbfcd07570a9e45e9597561023adb6da26f27f6':
librtmp: Avoid an infiniloop setting connection arguments
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions