[FFmpeg-cvslog] Merge commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049'

James Almer git at videolan.org
Sat Nov 11 18:56:54 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 13:55:35 2017 -0300| [460e7596cb5b1a449e50a7c3d2e6a5fff4a94c9a] | committer: James Almer

Merge commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049'

* commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049':
  aviocat: Check for output write errors

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=460e7596cb5b1a449e50a7c3d2e6a5fff4a94c9a
---

 tools/aviocat.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/aviocat.c b/tools/aviocat.c
index 983108a64a..28529b06d6 100644
--- a/tools/aviocat.c
+++ b/tools/aviocat.c
@@ -107,6 +107,11 @@ int main(int argc, char **argv)
         if (n <= 0)
             break;
         avio_write(output, buf, n);
+        if (output->error) {
+            av_strerror(output->error, errbuf, sizeof(errbuf));
+            fprintf(stderr, "Unable to write %s: %s\n", output_url, errbuf);
+            break;
+        }
         stream_pos += n;
         if (bps) {
             avio_flush(output);


======================================================================




More information about the ffmpeg-cvslog mailing list