Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 11:14:29 +0000 (13:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 11:14:29 +0000 (13:14 +0200)
commitf7bc03bcaff5b15e566110f73db0f1fc0d24a717
tree9b1be293ffcc1c2ede7d6dc1b99714be87fc8799
parent5fb652dddb79feabec91002ed6f5accb6ccb633d
parentc5b46a064d9991f2cd045c90179fccf35ecffc34
Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'

* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34':
  lavf: Don't interpret just slightly broken timestamps as wraparound

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c