[FFmpeg-cvslog] Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 12:18:02 2015 +0100| [09585e377c71bb1a153717350011e062ae089385] | committer: Michael Niedermayer

Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09585e377c71bb1a153717350011e062ae089385
---