Skip to content
Snippets Groups Projects
Commit 97a8f4dd authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '7785ce1c'


* commit '7785ce1c':
  lavf: replace rename() with ff_rename()

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

See: 95d2fc6a
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents af89c144 7785ce1c
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment