Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 07:59:29 +0000 (09:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 08:01:17 +0000 (10:01 +0200)
commit848295c2eeac23c07d9cb97a5200fa931bdd06f4
tree68c05c1f1834e0d0da14099a41791d97baf5374e
parent00b1401df6563e78c8616df4c62b8b5d6ac511a3
parenta87a0acf9b5d27aad032e61eef4973e62a4a6830
Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'

* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
  movenc: Make sure the RTP hint tracks have nondecreasing DTS

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