]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '8e34089e265a6b01e1e3301e8864439d26793753'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:20:09 +0000 (11:20 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 10 Aug 2015 09:20:09 +0000 (11:20 +0200)
* commit '8e34089e265a6b01e1e3301e8864439d26793753':
  movenc: Check that frag_info entries exist in mov_write_sidx_tag

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

Simple merge