Changeset 82f0f04 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

420aebf0

Parents:

74622ad3 (diff), 35384934 (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 '35384934d6e27e0334060a23a0c83a3cb5cef198'

• commit '35384934d6e27e0334060a23a0c83a3cb5cef198': mov: cosmetics: reorder the list of tags

Conflicts:

libavformat/mov.c

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

(No files)