Changeset 348319f5 in ffmpeg

Timestamp:

May 31, 2015, 10:35:39 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2bedd17b

Parents:

c2876c01 (diff), a8a90906 (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 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

• commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c': mov: Correctly allocate ctts_data

Conflicts:

libavformat/mov.c

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

(No files)