Merge commit '7785ce1c769369abf85b276148548a5510aabb5f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:24:16 +0000 (04:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:24:16 +0000 (04:24 +0200)
commit97a8f4dd119e76218ede40bd94b562f94c79b9e7
tree3b7ac1b3cf01d859f2545012a8411fff4114c66d
parentaf89c144181f4a7003477c22a88d40b366b42a7c
parent7785ce1c769369abf85b276148548a5510aabb5f
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@gmx.at>
libavformat/hdsenc.c
libavformat/internal.h
libavformat/smoothstreamingenc.c