[FFmpeg-cvslog] Merge commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 17:56:48 2015 +0100| [446ac80ea594de6fca73dcba65fce8b06810fe96] | committer: Hendrik Leppkes

Merge commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab'

* commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab':
  mimic: Always return on failure

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

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