Changeset 420aebf0 in ffmpeg

Timestamp:

Dec 8, 2014, 9:14:29 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0dcebe26

Parents:

82f0f04 (diff), 174c5fde (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:13:23)

git-committer:

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

Message:

Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'

• commit '174c5fde90060faab67796a5eaef742630f1db6e': mov: parse @PRM and @PRQ metadata tags

Conflicts:

libavformat/mov.c

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

(No files)