[FFmpeg-cvslog] Merge commit '9ad1e0c12caa440de860bd8f2122beb11d73815c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Sep  7 16:19:40 2015 +0200| [1f1c10083352d2d118818b31ec223de8b24fae53] | committer: Hendrik Leppkes

Merge commit '9ad1e0c12caa440de860bd8f2122beb11d73815c'

* commit '9ad1e0c12caa440de860bd8f2122beb11d73815c':
  mux: Make sure that the data is actually written

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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