[FFmpeg-cvslog] Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 16:13:04 2017 -0300| [a1afcf8b8c300de1e658884775db3426f2964cc8] | committer: James Almer

Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'

* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df11583800ee296effd42c51c65e9f3ef72

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

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