path: root/stream/stream_ffmpeg.c
diff options
authorranma <ranma@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-02-10 21:25:38 +0000
committerUoti Urpala <>2011-04-12 18:23:43 +0300
commitf8c32fc953320b93c5975c03d3d2f8a5febce498 (patch)
tree1e028da034c191693e0e90d98d6e501dcbbf0000 /stream/stream_ffmpeg.c
parent7fe2856fd99fb9211634a3fbf611fb8c04232396 (diff)
stream: Make stream_write_buffer() check for short writes
None of the calling sites to stream_write_buffer were checking the return value to see if all bytes got written (nothing in current code actually calls it any more after MEncoder was removed). This was causing (very occasionally) problems with mencoder when using output pipes AND running under a sandbox or when being straced (ptrace is the culprit). Theoretically this problem can happen without pipes or ptrace. Only stream_file, stream_smb and stream_ffmpeg implement write_buffer and ffmpeg already handles this internally. Original patch by Sang-Uok Kum. Signed-off-by: Tobias Diedrich <> git-svn-id: svn:// b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_ffmpeg.c')
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;