Changeset 2f41b186 in ffmpeg

Timestamp:

Mar 9, 2014, 9:11:08 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6783b3eb

Parents:

8a5397d (diff), eeae858 (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> (03/09/14 21:07:28)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/09/14 21:11:08)

Message:

Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

• commit 'eeae858596a5ce5a84797283f590a16add5704f4': isom: Support Sony XAVC in mov

See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)