[FFmpeg-cvslog] Merge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'

[James Almer]

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

Merge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'

* commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5':
  libxvid: Require availability of mkstemp()

This commit is a noop. Our libxvid wrapper doesn't use mkstemp().

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

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