Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:22:14 +0000 (01:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:22:14 +0000 (01:22 +0100)
commitd3316c3f85c291f6875e3cc56dae2ccea1f15f09
treedba644ba851a517bfb896148a30307f52ffef186
parent324797eb83dff7708a464e2ff61dd1551cc5c058
parent19fc283dbb53a5f7d6658fd4edcfa59b99369b58
Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4

* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
  lavf: replace rename() with ff_rename()

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

See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hdsenc.c
libavformat/internal.h
libavformat/smoothstreamingenc.c