diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 05:12:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 05:12:10 +0400 |
| commit | 7891b4fa590b3d21da028e56bf2c1eee1fe8260f (patch) | |
| tree | c61c9203c6666be7e1375642028f19b34a305cd6 /libavformat/url.h | |
| parent | 178764e833b14513ca4aaffa83f3d8444759a6ee (diff) | |
| parent | 9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0 (diff) | |
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
rtmpproto: Add pause support
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/url.h')
0 files changed, 0 insertions, 0 deletions