[FFmpeg-cvslog] Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:25:04 2016 +0100| [a2906846da10f3277ca857fad43faf18c9b8ca8c] | committer: Derek Buitenhuis

Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'

This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.

* commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89':
  img2enc: Refactor the atomic renaming code

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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