diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-29 13:14:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-29 13:14:29 +0200 |
| commit | f7bc03bcaff5b15e566110f73db0f1fc0d24a717 (patch) | |
| tree | 9b1be293ffcc1c2ede7d6dc1b99714be87fc8799 /libavutil/parseutils.c | |
| parent | 5fb652dddb79feabec91002ed6f5accb6ccb633d (diff) | |
| parent | c5b46a064d9991f2cd045c90179fccf35ecffc34 (diff) | |
Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'
* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34':
lavf: Don't interpret just slightly broken timestamps as wraparound
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions