Merge commit '7785ce1c'
* commit '7785ce1c': lavf: replace rename() with ff_rename() Conflicts: libavformat/hdsenc.c libavformat/internal.h See: 95d2fc6a Merged-by:Michael Niedermayer <michaelni@gmx.at>
Loading
Please register or sign in to comment