Changeset d302853b in ffmpeg

Timestamp:

Feb 17, 2015, 7:25:47 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a4cd057b

Parents:

d2668ae4 (diff), 5dc47a2b (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 '5dc47a2bd52e375ed742c45d08356b45098f458d'

• commit '5dc47a2bd52e375ed742c45d08356b45098f458d': matroskaenc: Validate chapter start and end times

Conflicts:

libavformat/matroskaenc.c

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

(No files)