]> git.sesse.net Git - ffmpeg/commit
Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:55:34 +0000 (22:55 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:57:02 +0000 (22:57 +0100)
commit8fad4b4e251bb21f8871fa829b593454528aff24
treebda5790e6959ca5d64963800e06c4fb2de6accb3
parentfb40daa7f3b86b66b15973d33f4269461b1e1ffd
parent785c25443b56adb6dbbb78d68cccbd9bd4a42e05
Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05'

* commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05':
  movenc: Apply offsets on timestamps when peeking into interleaving queues

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/internal.h
libavformat/movenc.c
libavformat/mux.c