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)
* commit '3041183677bda0a431b36e96a2c76617abaa8183':
  dashenc: Heuristically fill in the duration of packets that need it

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

Simple merge