Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:18:02 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:18:05 +0000 (12:18 +0100)
commit09585e377c71bb1a153717350011e062ae089385
treeaa5ff2bcc61736507944b0ff8545a33fb4a737d4
parent76fef5cd27861ec3b574a06e8be6ea03bcdde7a5
parent3041183677bda0a431b36e96a2c76617abaa8183
Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'

* commit '3041183677bda0a431b36e96a2c76617abaa8183':
  dashenc: Heuristically fill in the duration of packets that need it

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