]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 16:55:35 +0000 (13:55 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 16:55:35 +0000 (13:55 -0300)
* commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049':
  aviocat: Check for output write errors

Merged-by: James Almer <jamrial@gmail.com>
1  2 
tools/aviocat.c

diff --cc tools/aviocat.c
Simple merge