Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 12:38:17 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 12:38:25 +0000 (13:38 +0100)
commitb5448e66b0b88da95a3c8f08a2b2d416049585a5
tree80dee250d35d2fb54621ba430d452d0900037465
parent25d7e3ad594a8b5ed1b840d75185df34efdde6ad
parent67a2912307c3c08f2725ccae162cfe3426b80184
Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'

* commit '67a2912307c3c08f2725ccae162cfe3426b80184':
  movenc: Don't assume that fragment durations in pts is equal to duration in dts

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