Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:46:02 +0000 (14:46 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:46:02 +0000 (14:46 +0200)
commitf4ce8cea7327a452441a5920426cb391adca61b2
treeae13fe658f2a37c4f611263036bd4dda9f155b37
parent72773203a64af0a66a4e37fa03bf8744116f517a
parent7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4
Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4'

* commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4':
  mov: Allow more than one keyframe per trun

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