diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:34:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:34:19 +0100 |
| commit | 04894ef32e325e33d420e15c16e3714e0f95fdb0 (patch) | |
| tree | 2dc3965064061cfbe8f0551cb1f1f5a4b802a768 /libavformat/rtsp.h | |
| parent | 5a7a56d7bef3304a85b49133e42b6a73ab4de181 (diff) | |
| parent | 9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05 (diff) | |
| download | ffmpeg-04894ef32e325e33d420e15c16e3714e0f95fdb0.tar.gz | |
Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
rtpenc: Add a rtpflag option for sending BYE packets when finishing
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
0 files changed, 0 insertions, 0 deletions