-
Michael Niedermayer authored
* commit '19fc283d': lavf: replace rename() with ff_rename() Conflicts: libavformat/hdsenc.c libavformat/internal.h See: 95d2fc6aMerged-by:
Michael Niedermayer <michaelni@gmx.at>
d3316c3f
* commit '19fc283d': lavf: replace rename() with ff_rename() Conflicts: libavformat/hdsenc.c libavformat/internal.h See: 95d2fc6aMerged-by:Michael Niedermayer <michaelni@gmx.at>