diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
| commit | 7e65428712beacd416dc3410c52f22ebfd3b4c53 (patch) | |
| tree | 79bb2f4388be7031b5505c7745e1a59aff6cff56 /stream/stream_ffmpeg.c | |
| parent | 5c4b059f1608f6d6a981b7d81a14f1c46e40ba52 (diff) | |
| parent | d0376729d171a6c0b4cc15928c168f68adefbaa6 (diff) | |
| download | mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.bz2 mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'stream/stream_ffmpeg.c')
| -rw-r--r-- | stream/stream_ffmpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index e6705883fc..343381afb0 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -34,6 +34,7 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len) static int write_buffer(stream_t *s, char *buffer, int len) { + /* url_write retries internally on short writes and EAGAIN */ int r = url_write(s->priv, buffer, len); return (r <= 0) ? -1 : r; } |