Changeset 07941c2c in ffmpeg

Timestamp:

May 19, 2014, 5:21:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cd7ae5af

Parents:

ef1d4ee2 (diff), 853cc025 (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 '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

• commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043': mov: store display matrix in a stream side data

Conflicts:

libavformat/isom.h
libavformat/mov.c

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

(No files)