[FFmpeg-cvslog] Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:46:02 2015 +0200| [f4ce8cea7327a452441a5920426cb391adca61b2] | committer: Hendrik Leppkes

Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4ce8cea7327a452441a5920426cb391adca61b2
---