Merge commit '09e431b9e3674804172e7b0a0f865b65ec09739a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 Nov 2015 14:55:22 +0000 (14:55 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 17 Nov 2015 14:55:22 +0000 (14:55 +0000)
commit6c9fb32ae47678ca1025d92f30926015d5e8a9ad
treea94997131ba7bc8074fad5f5be4686e7df7eebce
parentbf6d41d8a233368a2ef7b56cbb762db95c799e2a
parent09e431b9e3674804172e7b0a0f865b65ec09739a
Merge commit '09e431b9e3674804172e7b0a0f865b65ec09739a'

* commit '09e431b9e3674804172e7b0a0f865b65ec09739a':
  movenc: Assume streams starting at pts=0 for discontinuous fragments with editlists

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/movenc.c