diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 10:17:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-05 10:17:07 +0100 |
| commit | 513d57cc4d3355baf4fca46cb1d2e6a0d82ee82a (patch) | |
| tree | e9598c24312127f179b4eb0c0ec74ead47fa96c6 /libavformat/udp.c | |
| parent | 37425fcb04748cf3177113f1615447bf7b3cb7ba (diff) | |
| parent | a490391157dcf4dc6b65352ec3eea2781dd0a404 (diff) | |
Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'
* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
rtmpproto: Ignore errors from the getStreamLength method
Conflicts:
libavformat/rtmpproto.c
See: 09711545f5d256bd3ac77004d123dae36c5db8f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/udp.c')
0 files changed, 0 insertions, 0 deletions