Changeset cc663bd1 in ffmpeg

Timestamp:

Nov 27, 2014, 10:35:54 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4ae1d602

Parents:

097de4d (diff), 79fd186a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'

• commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e': lavf: Use MoveFileEx instead of rename/_wrename on windows

Conflicts:

configure

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)