diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:09:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:09:18 +0100 |
| commit | e48ff13ba722f2ac37681eeea1b7813292ac87fa (patch) | |
| tree | 00cd86bb670def668cbeab81121f061d69f8945c /libavformat/takdec.c | |
| parent | f3a35e9d599fc2c2cf3c253b5f34917a2e9669dd (diff) | |
| parent | 9272c965d9559a90ee64d46aebd99c117e07f7a3 (diff) | |
| download | ffmpeg-e48ff13ba722f2ac37681eeea1b7813292ac87fa.tar.gz | |
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/takdec.c')
0 files changed, 0 insertions, 0 deletions