Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 19:49:02 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 19:50:28 +0000 (21:50 +0200)
commitca9cc6fdcc78d964d37ca387d0bccbfbab21dbee
treea7e116df7d291335e6a73e349a6fa6a306542fc1
parent7da5ff5c18ae3f9d0943e41fb637a6ebefa9277f
parent152b797cd687e96a582a1cb908dddf3d330d7637
Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'

* commit '152b797cd687e96a582a1cb908dddf3d330d7637':
  flv: Do not mangle dts values for negative cts

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