diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:40:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 13:43:04 +0200 |
| commit | 4991eacc064f5edd3acba4ce0d9e0ce27cee2b42 (patch) | |
| tree | 7b45f36cd6789d613816138322bce99088a46cfc /libavcodec | |
| parent | e46cc1dab05e366feaf98efc9bd2d57e2fa58410 (diff) | |
| parent | 962d63157322466a9a82f9f9d84c1b6f1b582f65 (diff) | |
| download | ffmpeg-4991eacc064f5edd3acba4ce0d9e0ce27cee2b42.tar.gz | |
Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'
* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65':
matroskaenc: set the stream timebase earlier
Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions