diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 00:48:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 00:48:51 +0200 |
| commit | 6af1793dd5a26b0617b31b0165f94d4bfc7c5160 (patch) | |
| tree | 29219f7b787dff7ce0709feade754f12ab6f6135 /libavcodec/flacenc.c | |
| parent | 03bda44689914b68f0ebc6e39d6a30f5591b3781 (diff) | |
| parent | 9455a023be9f3915ccf5511a0b8fdb5b8897b2b6 (diff) | |
| download | ffmpeg-6af1793dd5a26b0617b31b0165f94d4bfc7c5160.tar.gz | |
Merge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1
* commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6':
matroskaenc: do not write negative timestamps
Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
No change to fate as ffmpeg was not affected by these bugs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacenc.c')
0 files changed, 0 insertions, 0 deletions