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)
* commit '14634429b915333f3612eaf41db3954222dc4aaf':
  lavf: update muxing doxy

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

Simple merge