Changeset 0dcebe26 in ffmpeg

Timestamp:

Dec 8, 2014, 9:59:16 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

72732307

Parents:

420aebf0 (diff), b704b648 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 21:33:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 21:59:16)

Message:

Merge commit 'b704b648f9ecb830874627db958a37e004107d1b'

• commit 'b704b648f9ecb830874627db958a37e004107d1b': mov: parse XMP metadata on demand

Conflicts:

libavformat/isom.h
libavformat/version.h

See: 054c506e3da35471ea92dbedcaaf720d0754f04e

The default is left unchanged at enabled
We can change the default if people prefer but i do not want to do that
in a merge.

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

(No files)