Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 20:02:31 +0000 (22:02 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 20:02:31 +0000 (22:02 +0200)
commitb1e1da52fe2e7320363fdaa0cdd276847e25bf53
tree626b8c306915e23a0daefb3e39f64beccd70675a
parent388f0957660027418ef931adaf21346e19ec2b67
parente1eb0fc960163402bbb4e630185790488f7d28ed
Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'

* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
  movenc: Use packets in interleaving queues for the duration at the end of fragments

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
libavformat/avformat.h
libavformat/internal.h
libavformat/movenc.c
libavformat/movenc.h
libavformat/mux.c
libavformat/version.h