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)
* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
  movenc: Make sure the RTP hint tracks have nondecreasing DTS

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

Simple merge