Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:32:38 +0000 (14:32 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:32:38 +0000 (14:32 +0200)
commit97bdb94341ae60630f019f8fa057be9bb35c08c8
tree7de2d58765d4edeec9cf0c515b49c3c16c82653b
parent314e6086315dafc2008839238b0d7b053ce009c4
parent14634429b915333f3612eaf41db3954222dc4aaf
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'

* commit '14634429b915333f3612eaf41db3954222dc4aaf':
  lavf: update muxing doxy

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