Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:14:59 +0000 (15:14 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:22:52 +0000 (15:22 +0200)
commitb01891a9f08b9d271d75d179b3138242a958ee04
tree6180f466be7e17e8059b3ab69a1fb5d95e776e32
parentd3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b
parent948f3c19a8bd069768ca411212aaf8c1ed96b10d
Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
17 files changed:
doc/APIchanges
libavcodec/audio_frame_queue.c
libavcodec/audio_frame_queue.h
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/parser.c
libavcodec/version.h
libavformat/framecrcenc.c
libavformat/jacosubdec.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/md5enc.c
libavformat/movenc.c
libavformat/mux.c
libavformat/r3d.c
libavformat/srtenc.c
libavformat/utils.c