Changeset 885e7462 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

754f4957

Parents:

4acc717a (diff), e2e07dba (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 22:01:42)

git-committer:

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

Message:

Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'

• commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14': mov: expand the list of parsed metadata tags

Conflicts:

libavformat/mov.c

See: 543f3db9784348499a1ac1088373e2fb9100d4c0
See: dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)