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