[FFmpeg-cvslog] Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:24:16 2014 +0200| [97a8f4dd119e76218ede40bd94b562f94c79b9e7] | committer: Michael Niedermayer

Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'

* commit '7785ce1c769369abf85b276148548a5510aabb5f':
  lavf: replace rename() with ff_rename()

Conflicts:
	libavformat/hdsenc.c
	libavformat/internal.h

See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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