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)
* commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4':
  mov: Allow more than one keyframe per trun

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

Simple merge