diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:39:31 +0100 |
| commit | 03ae616b194e873ce22cef1878666b9d3028e56f (patch) | |
| tree | fb1913ef33b54556b70a3af911fbe7fd4cff290a /libavformat/matroskadec.c | |
| parent | 830c3058ff468bc2298c3be26917a08d089a77ff (diff) | |
| parent | fa6b99d351ed483766a875054676a56fd8459774 (diff) | |
| download | ffmpeg-03ae616b194e873ce22cef1878666b9d3028e56f.tar.gz | |
Merge commit 'fa6b99d351ed483766a875054676a56fd8459774' into release/2.2
* commit 'fa6b99d351ed483766a875054676a56fd8459774':
hevc: Do not turn 32bit timebases into negative numbers
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions