[FFmpeg-cvslog] Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 15:14:59 2015 +0200| [b01891a9f08b9d271d75d179b3138242a958ee04] | committer: Hendrik Leppkes

Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'

* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
  lavc: Make AVPacket.duration int64, and deprecate convergence_duration

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

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