Changeset 69de229b in ffmpeg

Timestamp:

May 28, 2014, 10:41:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1c0ce2d4

Parents:

40beec6 (diff), 6df478bf (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 '6df478bf891b9fc5626e4a0b993899f310ba0a1c'

• commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c': matroskadec: split parsing tracks into a separate function

Conflicts:

libavformat/matroskadec.c

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

(No files)