[FFmpeg-cvslog] Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 18:25:51 2015 +0100| [d3d4bc4784d911236b232e56e4ae476c484381c8] | committer: Hendrik Leppkes

Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'

* commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4':
  avconv: set packet duration for CFR video streams

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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