Changeset 25e4ec6a in ffmpeg

Timestamp:

Aug 22, 2013, 12:16:52 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7af7b45c

Parents:

606a30c5 (diff), 60198742 (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 '60198742ff851f11a3757c713fc75a9c19b88566'

• commit '60198742ff851f11a3757c713fc75a9c19b88566': movenc: fix detection of 64bit offset requirement

Conflicts:

libavformat/movenc.c

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

(No files)