Changeset a083543d in ffmpeg

Timestamp:

Jun 6, 2014, 11:24:30 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c2e2b29b

Parents:

ec98f80a (diff), e7d6d0bf (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 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'

• commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c': mov: Export geotag metadata fields

Conflicts:

libavformat/mov.c

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

(No files)